Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/04: [FREELDR] Formatting only.
by Hermès Bélusca-Maïto 31 Aug '19

31 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=602fc29ad4e7781c5e86b… commit 602fc29ad4e7781c5e86bcb3c07d9e645beb3fce Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 31 00:34:57 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 31 01:42:40 2019 +0200 [FREELDR] Formatting only. --- boot/freeldr/freeldr/arch/i386/hardware.c | 2 -- boot/freeldr/freeldr/arch/i386/hwacpi.c | 2 +- boot/freeldr/freeldr/arch/i386/hwapm.c | 1 - boot/freeldr/freeldr/arch/i386/hwpci.c | 1 - boot/freeldr/freeldr/arch/i386/i386vid.c | 1 - boot/freeldr/freeldr/arch/i386/machpc.c | 1 - boot/freeldr/freeldr/arch/i386/machxbox.c | 1 - boot/freeldr/freeldr/arch/i386/pcdisk.c | 1 - boot/freeldr/freeldr/arch/i386/pcmem.c | 1 - boot/freeldr/freeldr/arch/i386/pcvideo.c | 3 +-- boot/freeldr/freeldr/disk/disk.c | 1 - boot/freeldr/freeldr/disk/partition.c | 1 - boot/freeldr/freeldr/disk/scsiport.c | 9 ++++----- boot/freeldr/freeldr/lib/cache/blocklist.c | 2 +- boot/freeldr/freeldr/lib/cache/cache.c | 2 +- boot/freeldr/freeldr/lib/fs/btrfs.c | 2 +- boot/freeldr/freeldr/lib/fs/ext2.c | 2 +- boot/freeldr/freeldr/lib/fs/fat.c | 1 - boot/freeldr/freeldr/lib/fs/iso.c | 4 ++-- boot/freeldr/freeldr/lib/fs/ntfs.c | 4 ++-- boot/freeldr/freeldr/lib/fs/pxe.c | 3 +-- boot/freeldr/freeldr/lib/inifile/ini_init.c | 1 + boot/freeldr/freeldr/lib/inifile/inifile.c | 2 +- boot/freeldr/freeldr/lib/inifile/parse.c | 2 +- boot/freeldr/freeldr/lib/mm/heap.c | 4 ++-- boot/freeldr/freeldr/lib/mm/meminit.c | 2 +- boot/freeldr/freeldr/ntldr/wlmemory.c | 1 - 27 files changed, 21 insertions(+), 36 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/hardware.c index f8d628d2640..0cac33d4986 100644 --- a/boot/freeldr/freeldr/arch/i386/hardware.c +++ b/boot/freeldr/freeldr/arch/i386/hardware.c @@ -22,10 +22,8 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); - #define MILLISEC (10) #define PRECISION (8) diff --git a/boot/freeldr/freeldr/arch/i386/hwacpi.c b/boot/freeldr/freeldr/arch/i386/hwacpi.c index 9a13c975d08..dcaad2d82df 100644 --- a/boot/freeldr/freeldr/arch/i386/hwacpi.c +++ b/boot/freeldr/freeldr/arch/i386/hwacpi.c @@ -19,8 +19,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); BOOLEAN AcpiPresent = FALSE; diff --git a/boot/freeldr/freeldr/arch/i386/hwapm.c b/boot/freeldr/freeldr/arch/i386/hwapm.c index f933224bea9..f3e64e27bd0 100644 --- a/boot/freeldr/freeldr/arch/i386/hwapm.c +++ b/boot/freeldr/freeldr/arch/i386/hwapm.c @@ -21,7 +21,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); static BOOLEAN diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index c5aa14a1333..c4f0e97488c 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -21,7 +21,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); FIND_PCI_BIOS FindPciBios = NULL; diff --git a/boot/freeldr/freeldr/arch/i386/i386vid.c b/boot/freeldr/freeldr/arch/i386/i386vid.c index 1138321fabb..67ee8010d02 100644 --- a/boot/freeldr/freeldr/arch/i386/i386vid.c +++ b/boot/freeldr/freeldr/arch/i386/i386vid.c @@ -20,7 +20,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); #include <pshpack2.h> diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 1929be4a93e..aabe606220c 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -20,7 +20,6 @@ #include <cportlib/cportlib.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 3fb951de1a6..c649622e968 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -19,7 +19,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pcdisk.c index d371c44c99e..3d30f4e13b9 100644 --- a/boot/freeldr/freeldr/arch/i386/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pcdisk.c @@ -22,7 +22,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(DISK); #include <pshpack2.h> diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index b3b5761d957..3fcab1f6a07 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -26,7 +26,6 @@ #include <arch/pc/x86common.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(MEMORY); #define ULONGLONG_ALIGN_DOWN_BY(size, align) \ diff --git a/boot/freeldr/freeldr/arch/i386/pcvideo.c b/boot/freeldr/freeldr/arch/i386/pcvideo.c index 7f21fc2c049..05252936545 100644 --- a/boot/freeldr/freeldr/arch/i386/pcvideo.c +++ b/boot/freeldr/freeldr/arch/i386/pcvideo.c @@ -20,6 +20,7 @@ #include <suppress.h> #include <debug.h> +DBG_DEFAULT_CHANNEL(UI); #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 @@ -50,8 +51,6 @@ #define VERTRES_350_SCANLINES 0x01 #define VERTRES_400_SCANLINES 0x02 -DBG_DEFAULT_CHANNEL(UI); - #include <pshpack2.h> typedef struct { diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index e9579a0beab..befae8bba4c 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -21,7 +21,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(DISK); CHAR FrldrBootPath[MAX_PATH] = ""; diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 67852a43048..d772791b004 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -21,7 +21,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(DISK); #define MaxDriveNumber 0xFF diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 8fc967d85ab..a3a66e08a77 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -10,6 +10,9 @@ #include <freeldr.h> +#include <debug.h> +DBG_DEFAULT_CHANNEL(SCSIPORT); + #define _SCSIPORT_ #include <ntddk.h> @@ -48,15 +51,11 @@ #undef ScsiPortReadRegisterUlong #undef ScsiPortReadRegisterUshort -#include <debug.h> - #define SCSI_PORT_NEXT_REQUEST_READY 0x0008 #define TAG_SCSI_DEVEXT 'DscS' #define TAG_SCSI_ACCESS_RANGES 'AscS' -DBG_DEFAULT_CHANNEL(SCSIPORT); - /* GLOBALS ********************************************************************/ #ifdef _M_IX86 @@ -1631,7 +1630,7 @@ LoadBootDeviceDriver(VOID) return EIO; /* Add the PE part of freeldr.sys to the list of loaded executables, it - contains Scsiport* exports, imported by ntbootdd.sys */ + contains ScsiPort* exports, imported by ntbootdd.sys */ Success = WinLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", "FREELDR.SYS", &__ImageBase, &FreeldrDTE); if (!Success) diff --git a/boot/freeldr/freeldr/lib/cache/blocklist.c b/boot/freeldr/freeldr/lib/cache/blocklist.c index 1828fc1d3f2..018e3f3a4e2 100644 --- a/boot/freeldr/freeldr/lib/cache/blocklist.c +++ b/boot/freeldr/freeldr/lib/cache/blocklist.c @@ -18,8 +18,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(CACHE); // Returns a pointer to a CACHE_BLOCK structure diff --git a/boot/freeldr/freeldr/lib/cache/cache.c b/boot/freeldr/freeldr/lib/cache/cache.c index a56068d05c6..37302d636d7 100644 --- a/boot/freeldr/freeldr/lib/cache/cache.c +++ b/boot/freeldr/freeldr/lib/cache/cache.c @@ -18,8 +18,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(CACHE); /////////////////////////////////////////////////////////////////////////////////////// diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 0912471b29c..a0b47a5e3da 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -8,8 +8,8 @@ /* Some code was taken from u-boot, https://github.com/u-boot/u-boot/tree/master/fs/btrfs */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(FILESYSTEM); #define TAG_BTRFS_INFO 'IftB' diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index 19550c8425e..fca705eaac2 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -19,8 +19,8 @@ #ifndef _M_ARM #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(FILESYSTEM); BOOLEAN Ext2OpenVolume(PEXT2_VOLUME_INFO Volume); diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index b2a91e3500c..63a1283a439 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -21,7 +21,6 @@ #include <freeldr.h> #include <debug.h> - DBG_DEFAULT_CHANNEL(FILESYSTEM); ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONGLONG PartitionSectorCount); diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 4c6a3e1dab4..76d1ec6ecf5 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -20,14 +20,14 @@ #ifndef _M_ARM #include <freeldr.h> + #include <debug.h> +DBG_DEFAULT_CHANNEL(FILESYSTEM); #define SECTORSIZE 2048 #define TAG_ISO_BUFFER 'BosI' #define TAG_ISO_FILE 'FosI' -DBG_DEFAULT_CHANNEL(FILESYSTEM); - static BOOLEAN IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryLength, PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { PDIR_RECORD Record; diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index e68e4044977..e6f7b2531b9 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -26,7 +26,9 @@ #ifndef _M_ARM #include <freeldr.h> + #include <debug.h> +DBG_DEFAULT_CHANNEL(FILESYSTEM); #define TAG_NTFS_CONTEXT 'CftN' #define TAG_NTFS_LIST 'LftN' @@ -37,8 +39,6 @@ #define TAG_NTFS_VOLUME 'VftN' #define TAG_NTFS_DATA 'DftN' -DBG_DEFAULT_CHANNEL(FILESYSTEM); - typedef struct _NTFS_VOLUME_INFO { NTFS_BOOTSECTOR BootSector; diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index dedc3157faa..da6135edb91 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -20,12 +20,11 @@ #include <freeldr.h> #include <debug.h> +DBG_DEFAULT_CHANNEL(FILESYSTEM); #define TAG_PXE_FILE 'FexP' #define NO_FILE ((ULONG)-1) -DBG_DEFAULT_CHANNEL(FILESYSTEM); - static IP4 _ServerIP = { 0, }; static ULONG _OpenFile = NO_FILE; static CHAR _OpenFileName[128]; diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index f9c7e1c26ad..319c6379e93 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -18,6 +18,7 @@ */ #include <freeldr.h> + #include <debug.h> DBG_DEFAULT_CHANNEL(INIFILE); diff --git a/boot/freeldr/freeldr/lib/inifile/inifile.c b/boot/freeldr/freeldr/lib/inifile/inifile.c index fa231e8518d..a15102f28da 100644 --- a/boot/freeldr/freeldr/lib/inifile/inifile.c +++ b/boot/freeldr/freeldr/lib/inifile/inifile.c @@ -18,8 +18,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(INIFILE); BOOLEAN IniOpenSection(PCSTR SectionName, ULONG_PTR* SectionId) diff --git a/boot/freeldr/freeldr/lib/inifile/parse.c b/boot/freeldr/freeldr/lib/inifile/parse.c index 1a5d1cff957..9a3c161e0ab 100644 --- a/boot/freeldr/freeldr/lib/inifile/parse.c +++ b/boot/freeldr/freeldr/lib/inifile/parse.c @@ -18,8 +18,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(INIFILE); LIST_ENTRY IniFileSectionListHead; diff --git a/boot/freeldr/freeldr/lib/mm/heap.c b/boot/freeldr/freeldr/lib/mm/heap.c index 0e45ba352da..7f2fda05380 100644 --- a/boot/freeldr/freeldr/lib/mm/heap.c +++ b/boot/freeldr/freeldr/lib/mm/heap.c @@ -18,12 +18,12 @@ */ #include <freeldr.h> + #include <debug.h> +DBG_DEFAULT_CHANNEL(HEAP); #define FREELDR_HEAP_VERIFIER -DBG_DEFAULT_CHANNEL(HEAP); - #define REDZONE_MARK 0xCCCCCCCCCCCCCCCCULL #define REDZONE_ALLOCATION 24 #define REDZONE_LOW_OFFSET 16 diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index 164236c81c1..8276cb8ca57 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -19,8 +19,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(MEMORY); PVOID PageLookupTableAddress = NULL; diff --git a/boot/freeldr/freeldr/ntldr/wlmemory.c b/boot/freeldr/freeldr/ntldr/wlmemory.c index 8259c383863..3d29c241a0f 100644 --- a/boot/freeldr/freeldr/ntldr/wlmemory.c +++ b/boot/freeldr/freeldr/ntldr/wlmemory.c @@ -12,7 +12,6 @@ #include "winldr.h" #include <debug.h> - DBG_DEFAULT_CHANNEL(WINDOWS); extern ULONG LoaderPagesSpanned;

1 0

[reactos] 02/04: [FREELDR] Update the FREELDR.INI documentation / template.
by Hermès Bélusca-Maïto 31 Aug '19

31 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98a44b4f9b613f621d498… commit 98a44b4f9b613f621d498343c18f6762830f030c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 31 00:27:24 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 31 01:42:23 2019 +0200 [FREELDR] Update the FREELDR.INI documentation / template. --- boot/freeldr/FREELDR.INI | 171 +++++++++++++++++++++++++++++++---------------- 1 file changed, 114 insertions(+), 57 deletions(-) diff --git a/boot/freeldr/FREELDR.INI b/boot/freeldr/FREELDR.INI index 7177121b824..ac63ff653bd 100644 --- a/boot/freeldr/FREELDR.INI +++ b/boot/freeldr/FREELDR.INI @@ -1,72 +1,137 @@ ; FreeLoader by Brian Palmer -; FREELDR.INI - FreeLoader Initialization file +; FREELDR.INI - FreeLoader Initialization File ; ; Each line must be less than 1024 characters long ; and must be either a section heading (i.e. [section_name]) ; or a setting (i.e. name=value) or a blank line. ; Comments start with a ';' character. -; Background colors can be any one of the following: -; Black -; Blue -; Green -; Cyan -; Red -; Magenta -; Brown -; Gray - -; Text colors can be any one of the background -; colors and any of the following: -; DarkGray -; LightBlue -; LightGreen -; LightCyan -; LightRed -; LightMagenta -; Yellow -; White ; [FREELOADER] Section Commands: ; -; Debug - FreeLoader debugging port parameters, e.g. /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 -; MessageBox - displays the specified text in a message box upon bootup -; MessageLine - adds a new line of text to a message box (must come before MessageBox command) -; TitleText - text that is displayed in the title box -; StatusBarColor - color of status bar's background -; StatusBarTextColor - color of status bar's text -; BackdropTextColor - color of the backdrop's fill -; BackdropColor - color of the backdrop's background -; BackdropFillStyle - backdrop fill style - can be Light, Medium, or Dark -; TitleBoxTextColor - title box text color -; TitleBoxColor - title box background color -; MessageBoxTextColor - message box text color -; MessageBoxColor - message box background color -; MenuTextColor - menu text color -; MenuColor - menu color -; TextColor - normal text color -; SelectedTextColor - selected text color -; SelectedColor - selected text background color -; TimeOut - sets the timeout (in seconds) before the first OS listed gets booted automagically +; Debug - FreeLoader debugging port parameters, e.g. +; /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 +; MessageBox - displays the specified text in a message box upon bootup. +; DefaultOS - specifies which OS listed is the default choice. +; TimeOut - sets the timeout (in seconds) before the first OS listed +; gets booted automatically. + +; [Display] Section Commands: +; +; DisplayMode - sets the video mode to be used by FreeLoader. +; The following values are supported: +; NORMAL_VGA for 80x25 +; EXTENDED_VGA for 80x50 on VGA 80x43 on EGA +; 0x501C for 80x28 +; 0x501E for 80x30 +; 0x5022 for 80x34 +; 0x502B for 80x43 +; 0x503C for 80x60 +; +; TitleText - text that is displayed in the title box. +; StatusBarColor - color of status bar's background. +; StatusBarTextColor - color of status bar's text. +; BackdropTextColor - color of the backdrop's fill. +; BackdropColor - color of the backdrop's background. +; BackdropFillStyle - backdrop fill style - can be: Light, Medium, Dark. +; TitleBoxTextColor - title box text color. +; TitleBoxColor - title box background color. +; MessageBoxTextColor - message box text color. +; MessageBoxColor - message box background color. +; MenuTextColor - menu text color. +; MenuColor - menu color. +; TextColor - normal text color. +; SelectedTextColor - selected text color. +; SelectedColor - selected text background color. +; SpecialEffects - turns on ("Yes") or off ("No") video special effects. +; +; Background colors can be any one of the following: +; Black, Blue, Green, Cyan, Red, Magenta, Brown, Gray. +; +; Text colors can be any one of the background colors and any of the following: +; DarkGray, LightBlue, LightGreen, LightCyan, LightRed, LightMagenta, +; Yellow, White. ; [OS-General] Section Commands: ; -; BootType - sets the boot type: Windows, WindowsNT40, Windows2003, Linux, BootSector, Partition, Drive, ReactOSSetup +; BootType - specifies the boot type: Windows, WindowsNT40, Windows2003, +; ReactOSSetup, Linux, BootSector, Partition, Drive ; BootPath - ARC path, e.g. multi(0)disk(0)rdisk(x)partition(y) -; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) +; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 +; maps harddisk1 to harddisk0 or DriveMap=fd1,fd0). + +; ["Drive" OSType] Section Commands: +; +; BootDrive - specifies the BIOS drive number to be used. +; +; REMARK: If a "BootPath" ARC path is specified, its value takes precedence +; over the "BootDrive" value. + +; ["Partition" OSType] Section Commands: +; +; BootDrive - specifies the BIOS drive number to be used. +; BootPartition - specifies the partition number to be used (default: 0). +; +; REMARK: If a "BootPath" ARC path is specified, its value takes precedence +; over both the "BootDrive" and "BootPartition" values. -; [BootSector OSType] Section Commands: +; ["BootSector" OSType] Section Commands: +; +; BootDrive - specifies the BIOS drive number to be used. +; BootPartition - specifies the partition number to be used (cannot be 0). +; +; REMARK: If a "BootPath" ARC path is specified, its value takes precedence +; over both the "BootDrive" and "BootPartition" values. ; -; BootSector - sets the filename of the bootsector to be loaded +; REMARK 2: The "BootDrive", "BootPartition" and "BootPath" values are optional. +; If none of them are given and a relative file path is specified by the +; "BootSectorFile" value, the default boot partition will be used instead. +; +; BootSectorFile - specifies the file name of the bootsector to be loaded. +; It can be either relative to "BootDrive" and "BootPartition" +; (or to "BootPath"), or be an absolute ARC path, in which case +; the "BootDrive" and "BootPartition" (or "BootPath") values +; will only be used to set the boot partition. -; [Windows(NT40|2003) OSType] Section Commands: +; ["Linux" OSType] Section Commands: +; +; BootDrive - specifies the BIOS drive number to be used. +; BootPartition - specifies the partition number to be used (cannot be 0). +; +; REMARK: If a "BootPath" ARC path is specified, its value takes precedence +; over both the "BootDrive" and "BootPartition" values. ; -; SystemPath - sets the system root path (must be a valid ARC - Path): +; REMARK 2: The "BootDrive", "BootPartition" and "BootPath" values are optional. +; If none of them are given and a relative file path is specified by the +; "Kernel" or "Initrd" values, the default boot partition will be used instead. +; +; Kernel - specifies the kernel file name to be used. +; It can be either relative to "BootDrive" and "BootPartition" +; (or to "BootPath"), or be an absolute ARC path, in which case +; the "BootDrive" and "BootPartition" (or "BootPath") values +; will only be used to set the boot partition. +; Initrd - specifies the optional init ramdisk file name to be used. +; The same remarks about the path as for "Kernel" remain valid. +; CommandLine - specifies the command line options for the kernel. + +; ["Windows(NT40|2003)" OSType] Section Commands: +; +; SystemPath - specifies the system root path (must be a valid ARC path): ; multi(0)disk(0)rdisk(0)partition(1)\reactos ; multi(0)disk(0)fdisk(0) -; Options - sets the command line options for the kernel being booted -; Kernel - sets the kernel filename (default: ntoskrnl.exe) -; Hal - sets the HAL filename (default: hal.dll) +; Options - specifies the command line options for the kernel being booted. +; Kernel - specifies the kernel file name (default: ntoskrnl.exe) +; Hal - specifies the HAL file name (default: hal.dll) +; +; REMARK: The "Kernel" and "Hal" values can be either relative to "SystemPath", +; or be an absolute ARC path. Also they can alternatively be specified using the +; NT-compatible "/HAL=filename" and "/KERNEL=filename" option switches to the +; "Options" value, in which case the latter ones take precedence. + +; ["ReactOSSetup" OSType] Section Commands: +; +; No options defined for the moment. This OS type is used to tell FreeLdr +; to start the SETUP portion of NT / ReactOS. [FREELOADER] @@ -74,14 +139,6 @@ MessageBox=Welcome to FreeLoader!\nCopyright (c) 2003 by Brian Palmer <brianp@sg DefaultOS=ReactOSHD TimeOut=10 -; DisplayMode can be: -; NORMAL_VGA for 80x25 -; EXTENDED_VGA for 80x50 on VGA 80x43 on EGA -; 0x501C for 80x28 -; 0x501E for 80x30 -; 0x5022 for 80x34 -; 0x502B for 80x43 -; 0x503C for 80x60 [Display] DisplayMode=NORMAL_VGA TitleText=Brian�s Custom FreeLoader Boot Disk

1 0

[reactos] 01/04: [FREELDR] Move around & static-ify some disk/partition functions.
by Hermès Bélusca-Maïto 31 Aug '19

31 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41ad62ea69017b43ed1d8… commit 41ad62ea69017b43ed1d873c7fc4081ffdc9b483 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 14 15:22:55 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 31 00:25:06 2019 +0200 [FREELDR] Move around & static-ify some disk/partition functions. --- boot/freeldr/freeldr/disk/partition.c | 258 +++++++++++++++++++--------------- boot/freeldr/freeldr/include/disk.h | 21 ++- 2 files changed, 158 insertions(+), 121 deletions(-) diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 3aa69d9b589..67852a43048 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -49,9 +49,98 @@ static struct { 0x002EE400, 0x00177000, PARTITION_FAT_16 } /* Cache3, Z: */ }; -BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, - PPARTITION_TABLE_ENTRY PartitionTableEntry, - ULONG *ActivePartition) +static BOOLEAN +DiskReadBootRecord( + IN UCHAR DriveNumber, + IN ULONGLONG LogicalSectorNumber, + OUT PMASTER_BOOT_RECORD BootRecord) +{ + ULONG Index; + + /* Read master boot record */ + if (!MachDiskReadLogicalSectors(DriveNumber, LogicalSectorNumber, 1, DiskReadBuffer)) + { + return FALSE; + } + RtlCopyMemory(BootRecord, DiskReadBuffer, sizeof(MASTER_BOOT_RECORD)); + + TRACE("Dumping partition table for drive 0x%x:\n", DriveNumber); + TRACE("Boot record logical start sector = %d\n", LogicalSectorNumber); + TRACE("sizeof(MASTER_BOOT_RECORD) = 0x%x.\n", sizeof(MASTER_BOOT_RECORD)); + + for (Index = 0; Index < 4; Index++) + { + TRACE("-------------------------------------------\n"); + TRACE("Partition %d\n", (Index + 1)); + TRACE("BootIndicator: 0x%x\n", BootRecord->PartitionTable[Index].BootIndicator); + TRACE("StartHead: 0x%x\n", BootRecord->PartitionTable[Index].StartHead); + TRACE("StartSector (Plus 2 cylinder bits): 0x%x\n", BootRecord->PartitionTable[Index].StartSector); + TRACE("StartCylinder: 0x%x\n", BootRecord->PartitionTable[Index].StartCylinder); + TRACE("SystemIndicator: 0x%x\n", BootRecord->PartitionTable[Index].SystemIndicator); + TRACE("EndHead: 0x%x\n", BootRecord->PartitionTable[Index].EndHead); + TRACE("EndSector (Plus 2 cylinder bits): 0x%x\n", BootRecord->PartitionTable[Index].EndSector); + TRACE("EndCylinder: 0x%x\n", BootRecord->PartitionTable[Index].EndCylinder); + TRACE("SectorCountBeforePartition: 0x%x\n", BootRecord->PartitionTable[Index].SectorCountBeforePartition); + TRACE("PartitionSectorCount: 0x%x\n", BootRecord->PartitionTable[Index].PartitionSectorCount); + } + + /* Check the partition table magic value */ + if (BootRecord->MasterBootRecordMagic != 0xaa55) + { + return FALSE; + } + + return TRUE; +} + +static BOOLEAN +DiskGetFirstPartitionEntry( + IN PMASTER_BOOT_RECORD MasterBootRecord, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + ULONG Index; + + for (Index = 0; Index < 4; Index++) + { + /* Check the system indicator. If it's not an extended or unused partition then we're done. */ + if ((MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_ENTRY_UNUSED) && + (MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_EXTENDED) && + (MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_XINT13_EXTENDED)) + { + RtlCopyMemory(PartitionTableEntry, &MasterBootRecord->PartitionTable[Index], sizeof(PARTITION_TABLE_ENTRY)); + return TRUE; + } + } + + return FALSE; +} + +static BOOLEAN +DiskGetFirstExtendedPartitionEntry( + IN PMASTER_BOOT_RECORD MasterBootRecord, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + ULONG Index; + + for (Index = 0; Index < 4; Index++) + { + /* Check the system indicator. If it an extended partition then we're done. */ + if ((MasterBootRecord->PartitionTable[Index].SystemIndicator == PARTITION_EXTENDED) || + (MasterBootRecord->PartitionTable[Index].SystemIndicator == PARTITION_XINT13_EXTENDED)) + { + RtlCopyMemory(PartitionTableEntry, &MasterBootRecord->PartitionTable[Index], sizeof(PARTITION_TABLE_ENTRY)); + return TRUE; + } + } + + return FALSE; +} + +static BOOLEAN +DiskGetActivePartitionEntry( + IN UCHAR DriveNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry, + OUT PULONG ActivePartition) { ULONG BootablePartitionCount = 0; ULONG CurrentPartitionNumber; @@ -61,14 +150,14 @@ BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, *ActivePartition = 0; - // Read master boot record + /* Read master boot record */ if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) { return FALSE; } CurrentPartitionNumber = 0; - for (Index=0; Index<4; Index++) + for (Index = 0; Index < 4; Index++) { ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; @@ -78,13 +167,13 @@ BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, { CurrentPartitionNumber++; - // Test if this is the bootable partition + /* Test if this is the bootable partition */ if (ThisPartitionTableEntry->BootIndicator == 0x80) { BootablePartitionCount++; *ActivePartition = CurrentPartitionNumber; - // Copy the partition table entry + /* Copy the partition table entry */ RtlCopyMemory(PartitionTableEntry, ThisPartitionTableEntry, sizeof(PARTITION_TABLE_ENTRY)); @@ -92,7 +181,7 @@ BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, } } - // Make sure there was only one bootable partition + /* Make sure there was only one bootable partition */ if (BootablePartitionCount == 0) { ERR("No bootable (active) partitions found.\n"); @@ -107,7 +196,11 @@ BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, return TRUE; } -BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +static BOOLEAN +DiskGetMbrPartitionEntry( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) { MASTER_BOOT_RECORD MasterBootRecord; PARTITION_TABLE_ENTRY ExtendedPartitionTableEntry; @@ -117,14 +210,14 @@ BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPART ULONG CurrentPartitionNumber; PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; - // Read master boot record + /* Read master boot record */ if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) { return FALSE; } CurrentPartitionNumber = 0; - for (Index=0; Index<4; Index++) + for (Index = 0; Index < 4; Index++) { ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; @@ -142,136 +235,63 @@ BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPART } } - // They want an extended partition entry so we will need - // to loop through all the extended partitions on the disk - // and return the one they want. - + /* + * They want an extended partition entry so we will need + * to loop through all the extended partitions on the disk + * and return the one they want. + */ ExtendedPartitionNumber = PartitionNumber - CurrentPartitionNumber - 1; - // Set the initial relative starting sector to 0 - // This is because extended partition starting - // sectors a numbered relative to their parent + /* + * Set the initial relative starting sector to 0. + * This is because extended partition starting + * sectors a numbered relative to their parent. + */ ExtendedPartitionOffset = 0; - for (Index=0; Index<=ExtendedPartitionNumber; Index++) + for (Index = 0; Index <= ExtendedPartitionNumber; Index++) { - // Get the extended partition table entry + /* Get the extended partition table entry */ if (!DiskGetFirstExtendedPartitionEntry(&MasterBootRecord, &ExtendedPartitionTableEntry)) { return FALSE; } - // Adjust the relative starting sector of the partition + /* Adjust the relative starting sector of the partition */ ExtendedPartitionTableEntry.SectorCountBeforePartition += ExtendedPartitionOffset; if (ExtendedPartitionOffset == 0) { - // Set the start of the parrent extended partition + /* Set the start of the parrent extended partition */ ExtendedPartitionOffset = ExtendedPartitionTableEntry.SectorCountBeforePartition; } - // Read the partition boot record + /* Read the partition boot record */ if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord)) { return FALSE; } - // Get the first real partition table entry + /* Get the first real partition table entry */ if (!DiskGetFirstPartitionEntry(&MasterBootRecord, PartitionTableEntry)) { return FALSE; } - // Now correct the start sector of the partition + /* Now correct the start sector of the partition */ PartitionTableEntry->SectorCountBeforePartition += ExtendedPartitionTableEntry.SectorCountBeforePartition; } - // When we get here we should have the correct entry - // already stored in PartitionTableEntry - // so just return TRUE - return TRUE; -} - -BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - ULONG Index; - - for (Index=0; Index<4; Index++) - { - // Check the system indicator - // If it's not an extended or unused partition - // then we're done - if ((MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_ENTRY_UNUSED) && - (MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_EXTENDED) && - (MasterBootRecord->PartitionTable[Index].SystemIndicator != PARTITION_XINT13_EXTENDED)) - { - RtlCopyMemory(PartitionTableEntry, &MasterBootRecord->PartitionTable[Index], sizeof(PARTITION_TABLE_ENTRY)); - return TRUE; - } - } - - return FALSE; -} - -BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - ULONG Index; - - for (Index=0; Index<4; Index++) - { - // Check the system indicator - // If it an extended partition then we're done - if ((MasterBootRecord->PartitionTable[Index].SystemIndicator == PARTITION_EXTENDED) || - (MasterBootRecord->PartitionTable[Index].SystemIndicator == PARTITION_XINT13_EXTENDED)) - { - RtlCopyMemory(PartitionTableEntry, &MasterBootRecord->PartitionTable[Index], sizeof(PARTITION_TABLE_ENTRY)); - return TRUE; - } - } - - return FALSE; -} - -BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord) -{ - ULONG Index; - - // Read master boot record - if (!MachDiskReadLogicalSectors(DriveNumber, LogicalSectorNumber, 1, DiskReadBuffer)) - { - return FALSE; - } - RtlCopyMemory(BootRecord, DiskReadBuffer, sizeof(MASTER_BOOT_RECORD)); - - TRACE("Dumping partition table for drive 0x%x:\n", DriveNumber); - TRACE("Boot record logical start sector = %d\n", LogicalSectorNumber); - TRACE("sizeof(MASTER_BOOT_RECORD) = 0x%x.\n", sizeof(MASTER_BOOT_RECORD)); - - for (Index=0; Index<4; Index++) - { - TRACE("-------------------------------------------\n"); - TRACE("Partition %d\n", (Index + 1)); - TRACE("BootIndicator: 0x%x\n", BootRecord->PartitionTable[Index].BootIndicator); - TRACE("StartHead: 0x%x\n", BootRecord->PartitionTable[Index].StartHead); - TRACE("StartSector (Plus 2 cylinder bits): 0x%x\n", BootRecord->PartitionTable[Index].StartSector); - TRACE("StartCylinder: 0x%x\n", BootRecord->PartitionTable[Index].StartCylinder); - TRACE("SystemIndicator: 0x%x\n", BootRecord->PartitionTable[Index].SystemIndicator); - TRACE("EndHead: 0x%x\n", BootRecord->PartitionTable[Index].EndHead); - TRACE("EndSector (Plus 2 cylinder bits): 0x%x\n", BootRecord->PartitionTable[Index].EndSector); - TRACE("EndCylinder: 0x%x\n", BootRecord->PartitionTable[Index].EndCylinder); - TRACE("SectorCountBeforePartition: 0x%x\n", BootRecord->PartitionTable[Index].SectorCountBeforePartition); - TRACE("PartitionSectorCount: 0x%x\n", BootRecord->PartitionTable[Index].PartitionSectorCount); - } - - // Check the partition table magic value - if (BootRecord->MasterBootRecordMagic != 0xaa55) - { - return FALSE; - } - + /* + * When we get here we should have the correct entry already + * stored in PartitionTableEntry, so just return TRUE. + */ return TRUE; } -BOOLEAN -DiskGetBrfrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +static BOOLEAN +DiskGetBrfrPartitionEntry( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) { /* * Get partition entry of an Xbox-standard BRFR partitioned disk. @@ -296,7 +316,9 @@ DiskGetBrfrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_T return FALSE; } -VOID DiskDetectPartitionType(UCHAR DriveNumber) +VOID +DiskDetectPartitionType( + IN UCHAR DriveNumber) { MASTER_BOOT_RECORD MasterBootRecord; ULONG Index; @@ -347,9 +369,11 @@ VOID DiskDetectPartitionType(UCHAR DriveNumber) TRACE("Drive 0x%X partition type unknown\n", DriveNumber); } -BOOLEAN DiskGetBootPartitionEntry(UCHAR DriveNumber, - PPARTITION_TABLE_ENTRY PartitionTableEntry, - ULONG *BootPartition) +BOOLEAN +DiskGetBootPartitionEntry( + IN UCHAR DriveNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry, + OUT PULONG BootPartition) { switch (DiskPartitionType[DriveNumber]) { @@ -385,7 +409,11 @@ BOOLEAN DiskGetBootPartitionEntry(UCHAR DriveNumber, return FALSE; } -BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +BOOLEAN +DiskGetPartitionEntry( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) { switch (DiskPartitionType[DriveNumber]) { diff --git a/boot/freeldr/freeldr/include/disk.h b/boot/freeldr/freeldr/include/disk.h index 6629c768dcf..68c197ba509 100644 --- a/boot/freeldr/freeldr/include/disk.h +++ b/boot/freeldr/freeldr/include/disk.h @@ -145,12 +145,21 @@ extern SIZE_T DiskReadBufferSize; // /////////////////////////////////////////////////////////////////////////////////////// -VOID DiskDetectPartitionType(UCHAR DriveNumber); -BOOLEAN DiskGetBootPartitionEntry(UCHAR DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *BootPartition); -BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord); +VOID +DiskDetectPartitionType( + IN UCHAR DriveNumber); + +BOOLEAN +DiskGetBootPartitionEntry( + IN UCHAR DriveNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry, + OUT PULONG BootPartition); + +BOOLEAN +DiskGetPartitionEntry( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber, + OUT PPARTITION_TABLE_ENTRY PartitionTableEntry); /* * SCSI support (disk/scsiport.c)

1 0

[reactos] 02/02: [VIDEOPRT] Fix uninitialized Reserved bit field in PciSlotNumber
by Stanislav Motylkov 30 Aug '19

30 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32fb2e7b5f94e23fda11e… commit 32fb2e7b5f94e23fda11efc27a988eaec11bf190 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 30 23:18:06 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 31 00:19:03 2019 +0200 [VIDEOPRT] Fix uninitialized Reserved bit field in PciSlotNumber CORE-16317 --- win32ss/drivers/videoprt/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/drivers/videoprt/resource.c b/win32ss/drivers/videoprt/resource.c index 9cad3299ca1..4a44392a0f3 100644 --- a/win32ss/drivers/videoprt/resource.c +++ b/win32ss/drivers/videoprt/resource.c @@ -629,6 +629,7 @@ VideoPortGetAccessRanges( /* * Search for the device id and vendor id on this bus. */ + PciSlotNumber.u.bits.Reserved = 0; for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) { PciSlotNumber.u.bits.DeviceNumber = DeviceNumber;

1 0

[reactos] 01/02: [XBOXVMP] Add Xbox video miniport driver
by Stanislav Motylkov 30 Aug '19

30 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c3614508737082e2048d… commit 8c3614508737082e2048d885bb7c8f8661d73f17 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Aug 12 12:34:29 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 31 00:19:03 2019 +0200 [XBOXVMP] Add Xbox video miniport driver Also make XboxVmp driver compatible with Video Port driver, specify vendor id and device id explicitly in VideoPortGetAccessRanges() call CORE-16317 --- boot/bootdata/txtsetup.sif | 2 ++ media/inf/display.inf | 9 +++++++++ win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 2 ++ win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 10 ++++++---- win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf | 13 +++++++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index f3f6ba6185f..feeae2404fa 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -282,11 +282,13 @@ vbe_1600x1200x8 = "VESA Display (1600x1200x8)",,VBE,1600,1200,8 vbe_1600x1200x16 = "VESA Display (1600x1200x16)",,VBE,1600,1200,16 vbe_1600x1200x24 = "VESA Display (1600x1200x24)",,VBE,1600,1200,24 vbe_1600x1200x32 = "VESA Display (1600x1200x32)",,VBE,1600,1200,32 +xbox = "Original Xbox NV2A Framebuffer (640x480x32)",,XboxVmp,640,480,32 [Map.Display] ;<id> = <pnp id string> vga = "VGA Display" vbe = "VBE Display" +xboxvmp = "NV2A Framebuffer" [Keyboard] Default = "XT-, AT- or extended keyboard (83-105 keys)" diff --git a/media/inf/display.inf b/media/inf/display.inf index 59a511b624d..87ebba7b3db 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -40,6 +40,7 @@ CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT [VGA.Miniport_CopyFiles.NT] vgamp.sys vbemp.sys +xboxvmp.sys [VGA.Display_CopyFiles.NT] vgaddi.dll @@ -49,6 +50,7 @@ framebuf.dll AddService = , 0x00000002 ;AddService = VGA, , VGA_Service_Inst ;AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE +;AddService = XboxVmp, 0x00000003, XBOX_Service_Inst [VGA_Service_Inst] ServiceType = 1 @@ -64,6 +66,13 @@ ErrorControl = 0 ServiceBinary = %12%\vbemp.sys LoadOrderGroup = Video Save +[XBOX_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\xboxvmp.sys +LoadOrderGroup = Video Save + ;-------------------------------- STRINGS ------------------------------- [Strings] diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt index 02ffb3e05ca..d5f9f1332af 100644 --- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt +++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt @@ -2,3 +2,5 @@ add_library(xboxvmp MODULE xboxvmp.c xboxvmp.rc) set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) +add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(xboxvmp_reg.inf) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c index 6841930d84f..6fabde00fd0 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c @@ -71,19 +71,21 @@ XboxVmpFindAdapter( PXBOXVMP_DEVICE_EXTENSION XboxVmpDeviceExtension; VIDEO_ACCESS_RANGE AccessRanges[3]; VP_STATUS Status; + USHORT VendorId = 0x10DE; /* NVIDIA Corporation */ + USHORT DeviceId = 0x02A0; /* NV2A XGPU */ VideoPortDebugPrint(Trace, "XboxVmpFindAdapter\n"); XboxVmpDeviceExtension = (PXBOXVMP_DEVICE_EXTENSION) HwDeviceExtension; Status = VideoPortGetAccessRanges(HwDeviceExtension, 0, NULL, 3, AccessRanges, - NULL, NULL, NULL); + &VendorId, &DeviceId, NULL); - if (NO_ERROR == Status) - { + if (Status == NO_ERROR) + { XboxVmpDeviceExtension->PhysControlStart = AccessRanges[0].RangeStart; XboxVmpDeviceExtension->ControlLength = AccessRanges[0].RangeLength; XboxVmpDeviceExtension->PhysFrameBufferStart = AccessRanges[1].RangeStart; - } + } return Status; } diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf new file mode 100644 index 00000000000..e7c2a3c5fdf --- /dev/null +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf @@ -0,0 +1,13 @@ +; Xbox Nvidia driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ImagePath",0x00020000,"system32\drivers\xboxvmp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_00000000&REV_A1\0000","Service",0x00000000,"XboxVmp" + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" + +; This is not true but it allows to use 3rd party drivers while having the XboxVmp driver installed +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","VgaCompatible",0x00010001,1

1 0

[reactos] 01/01: Update Header
by James Tabor 29 Aug '19

29 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a02b3da18365daf40fefb… commit a02b3da18365daf40fefbed140c187fa9c80546c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Aug 29 15:47:56 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Aug 29 15:47:56 2019 -0500 Update Header Add missing structure. --- sdk/include/psdk/wingdi.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/psdk/wingdi.h b/sdk/include/psdk/wingdi.h index bcaeb6c0e1b..5cb03cce58e 100644 --- a/sdk/include/psdk/wingdi.h +++ b/sdk/include/psdk/wingdi.h @@ -980,6 +980,16 @@ extern "C" { #define ICM_ON 2 #define ICM_OFF 1 #define ICM_QUERY 3 + +#if (WINVER >= 0x0400) +typedef struct _DRAWPATRECT { + POINT ptPosition; + POINT ptSize; + WORD wStyle; + WORD wPattern; +} DRAWPATRECT, *PDRAWPATRECT; +#endif + #define NEWFRAME 1 #define ABORTDOC 2 #define NEXTBAND 3

1 0

[reactos] 04/04: Fix the ntstrsafe.h tests to make sense, actually succeed using ntstrsafe.h from Win10 (10.0.15063), and fix ReactOS' ntstrsafe.h to also pass these tests. (#1859)
by Colin Finck 28 Aug '19

28 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8681feee94bf0e31dfb3… commit c8681feee94bf0e31dfb3f065fef432fa4eb39b6 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Aug 28 22:42:52 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Aug 28 22:42:52 2019 +0200 Fix the ntstrsafe.h tests to make sense, actually succeed using ntstrsafe.h from Win10 (10.0.15063), and fix ReactOS' ntstrsafe.h to also pass these tests. (#1859) --- modules/rostests/kmtests/rtl/RtlStrSafe.c | 262 +++++++++++++++--------------- sdk/include/ddk/ntstrsafe.h | 112 +++++-------- 2 files changed, 171 insertions(+), 203 deletions(-) diff --git a/modules/rostests/kmtests/rtl/RtlStrSafe.c b/modules/rostests/kmtests/rtl/RtlStrSafe.c index 807a036b2a7..82c2fe512cc 100644 --- a/modules/rostests/kmtests/rtl/RtlStrSafe.c +++ b/modules/rostests/kmtests/rtl/RtlStrSafe.c @@ -1,8 +1,9 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Test for ntstrsafe.h functions * COPYRIGHT: Copyright 2018 Hern�n Di Pietro <hernan.di.pietro(a)gmail.com> + * Copyright 2019 Colin Finck <colin(a)reactos.org> */ #define KMT_EMULATE_KERNEL @@ -13,163 +14,168 @@ #define TESTAPI static void +static const WCHAR FormatStringInts[] = L"%d %d %d"; +static const WCHAR FormatStringIntsResult[] = L"1 2 3"; +static const WCHAR FormatStringStrs[] = L"%s %s %s"; + + TESTAPI Test_RtlUnicodeStringPrintf() { - WCHAR Buffer[1024]; - WCHAR OvrBuffer[1024]; - WCHAR BufferSmall[2]; - WCHAR BufferSmall2[7]; + NTSTATUS Status; + PWSTR pBuffer = NULL; + size_t BufferSize; + size_t EqualBytes; UNICODE_STRING UsString; - const WCHAR FormatStringInts[] = L"%d %d %d"; - const WCHAR FormatStringStrs[] = L"%s %s %s"; - const WCHAR Result[] = L"1 2 3"; - UNICODE_STRING UsStringNull; - /* No zeros (Don't assume UNICODE_STRINGS are NULL terminated) */ - - RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); - RtlFillMemory(BufferSmall, sizeof(BufferSmall), 0xAA); - RtlFillMemory(BufferSmall2, sizeof(BufferSmall2), 0xAA); + KmtStartSeh(); /* STATUS_SUCCESS test */ + BufferSize = 6 * sizeof(WCHAR); + pBuffer = KmtAllocateGuarded(BufferSize); + if (!pBuffer) + goto Cleanup; + + RtlFillMemory(pBuffer, BufferSize, 0xAA); + RtlInitEmptyUnicodeString(&UsString, pBuffer, BufferSize); + + Status = RtlUnicodeStringPrintf(&UsString, FormatStringInts, 1, 2, 3); + EqualBytes = RtlCompareMemory(UsString.Buffer, FormatStringIntsResult, sizeof(FormatStringIntsResult)); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_size(EqualBytes, sizeof(FormatStringIntsResult)); + ok_eq_uint(UsString.Length, sizeof(FormatStringIntsResult) - sizeof(WCHAR)); + ok_eq_uint(UsString.MaximumLength, BufferSize); + + KmtFreeGuarded(pBuffer); + pBuffer = NULL; - UsString.Buffer = Buffer; - UsString.Length = 0; - UsString.MaximumLength = sizeof(Buffer); - - ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringInts, 1, 2, 3), STATUS_SUCCESS); - ok_eq_uint(UsString.Length, sizeof(Result) - sizeof(WCHAR)); - ok_eq_uint(UsString.MaximumLength, sizeof(Buffer)); - ok_eq_wchar(UsString.Buffer[0], L'1'); - ok_eq_wchar(UsString.Buffer[1], L' '); - ok_eq_wchar(UsString.Buffer[2], L'2'); - ok_eq_wchar(UsString.Buffer[3], L' '); - ok_eq_wchar(UsString.Buffer[4], L'3'); - ok_eq_wchar(UsString.Buffer[5], (WCHAR) 0); - /* STATUS_BUFFER_OVERFLOW tests */ + BufferSize = 2 * sizeof(WCHAR); + pBuffer = KmtAllocateGuarded(BufferSize); + if (!pBuffer) + goto Cleanup; - UsString.Buffer = BufferSmall; - UsString.Length = 0; - UsString.MaximumLength = sizeof(BufferSmall); - - ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_BUFFER_OVERFLOW); + RtlInitEmptyUnicodeString(&UsString, pBuffer, BufferSize); + + Status = RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"AAA", L"BBB", L"CCC"); + EqualBytes = RtlCompareMemory(UsString.Buffer, L"AA", BufferSize); + ok_eq_hex(Status, STATUS_BUFFER_OVERFLOW); + ok_eq_size(EqualBytes, BufferSize); ok_eq_uint(UsString.Length, UsString.MaximumLength); - ok_eq_char(UsString.Buffer[0], L'A'); - ok_eq_char(UsString.Buffer[1], (WCHAR)0); - UsString.Buffer = BufferSmall2; - UsString.Length = 0; - UsString.MaximumLength = sizeof(BufferSmall2); + KmtFreeGuarded(pBuffer); + pBuffer = NULL; + - ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"0123", L"4567", L"89AB"), STATUS_BUFFER_OVERFLOW); + BufferSize = 7 * sizeof(WCHAR); + pBuffer = KmtAllocateGuarded(BufferSize); + if (!pBuffer) + goto Cleanup; + + RtlInitEmptyUnicodeString(&UsString, pBuffer, BufferSize); + + Status = RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"0123", L"4567", L"89AB"); + EqualBytes = RtlCompareMemory(UsString.Buffer, L"0123 45", BufferSize); + ok_eq_hex(Status, STATUS_BUFFER_OVERFLOW); + ok_eq_size(EqualBytes, BufferSize); ok_eq_uint(UsString.Length, UsString.MaximumLength); - ok_eq_char(UsString.Buffer[0], L'0'); - ok_eq_char(UsString.Buffer[1], L'1'); - ok_eq_char(UsString.Buffer[2], L'2'); - ok_eq_char(UsString.Buffer[3], L'3'); - ok_eq_char(UsString.Buffer[4], L' '); - ok_eq_char(UsString.Buffer[5], L'4'); - ok_eq_char(UsString.Buffer[6], (WCHAR) 0); - - ///* STATUS_INVALID_PARAMETER tests */ - - ok_eq_hex(RtlUnicodeStringPrintf(NULL, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); - ok_eq_hex(RtlUnicodeStringPrintf(&UsString, NULL, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); - - UsStringNull.Buffer = (PWCH)NULL; - UsStringNull.Length = 0; - UsStringNull.MaximumLength = 0; - ok_eq_bool(RtlUnicodeStringPrintf(&UsStringNull, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); - - /* Test for buffer overruns */ - - RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); - RtlFillMemory(OvrBuffer, sizeof(OvrBuffer), 0xAA); - UsString.Buffer = Buffer; - UsString.Length = 0; - UsString.MaximumLength = 16 * sizeof(WCHAR); - - ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"abc", L"def", L"ghi"), STATUS_SUCCESS); - ok_eq_uint(UsString.Length, sizeof(L"abc def ghi") -sizeof(WCHAR)); - ok_eq_char(UsString.Buffer[11], (WCHAR)0); - ok_eq_uint(0, memcmp(OvrBuffer + 12, Buffer + 12, sizeof(Buffer) - (12 * sizeof(WCHAR)))); + + KmtFreeGuarded(pBuffer); + pBuffer = NULL; + + // Note: RtlUnicodeStringPrintf returns STATUS_BUFFER_OVERFLOW here while RtlUnicodeStringPrintfEx returns STATUS_INVALID_PARAMETER! + // Documented on MSDN and verified with the Win10 version of ntstrsafe.h + RtlInitEmptyUnicodeString(&UsString, NULL, 0); + Status = RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"AAA", L"BBB", L"CCC"); + ok_eq_hex(Status, STATUS_BUFFER_OVERFLOW); + + +Cleanup: + if (pBuffer) + KmtFreeGuarded(pBuffer); + + // None of these functions should have crashed. + KmtEndSeh(STATUS_SUCCESS); } TESTAPI Test_RtlUnicodeStringPrintfEx() { - WCHAR Buffer[32]; - WCHAR BufferSmall[8] = { 0 }; - WCHAR OvrBuffer[1024]; - UNICODE_STRING UsString, RemString; - const WCHAR FormatStringInts[] = L"%d %d %d"; - const WCHAR FormatStringStrs[] = L"%s %s %s"; - const WCHAR Result[] = L"1 2 3"; + NTSTATUS Status; + PWSTR pBuffer = NULL; + size_t BufferSize; + size_t EqualBytes; + UNICODE_STRING RemString; + UNICODE_STRING UsString; + WCHAR FillResult[10]; - /* No zeros (Don't assume UNICODE_STRINGS are NULL terminated) */ + RtlFillMemory(FillResult, sizeof(FillResult), 0xAA); - RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); + KmtStartSeh(); - UsString.Buffer = Buffer; - UsString.Length = 0; - UsString.MaximumLength = sizeof(Buffer); + /* STATUS_SUCCESS test, fill behind flag: low-byte as fill character */ + BufferSize = sizeof(FormatStringIntsResult) - sizeof(UNICODE_NULL) + sizeof(FillResult); + pBuffer = KmtAllocateGuarded(BufferSize); + if (!pBuffer) + goto Cleanup; + + RtlInitEmptyUnicodeString(&UsString, pBuffer, BufferSize); + RtlInitEmptyUnicodeString(&RemString, NULL, 0); + + Status = RtlUnicodeStringPrintfEx(&UsString, &RemString, STRSAFE_FILL_BEHIND | 0xAA, FormatStringInts, 1, 2, 3); + EqualBytes = RtlCompareMemory(UsString.Buffer, FormatStringIntsResult, sizeof(FormatStringIntsResult) - sizeof(WCHAR)); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_size(EqualBytes, sizeof(FormatStringIntsResult) - sizeof(WCHAR)); + ok_eq_uint(UsString.Length, sizeof(FormatStringIntsResult) - sizeof(WCHAR)); + ok_eq_uint(UsString.MaximumLength, BufferSize); + + ok_eq_pointer(RemString.Buffer, &UsString.Buffer[UsString.Length / sizeof(WCHAR)]); + ok_eq_uint(RemString.Length, 0); + ok_eq_uint(RemString.MaximumLength, UsString.MaximumLength - UsString.Length); - RemString.Buffer = (PWCH)NULL; - RemString.Length = 0; - RemString.MaximumLength = 0; + EqualBytes = RtlCompareMemory(RemString.Buffer, FillResult, RemString.MaximumLength); + ok_eq_size(EqualBytes, sizeof(FillResult)); + + KmtFreeGuarded(pBuffer); + pBuffer = NULL; - /* STATUS_SUCCESS test, fill behind flag: low-byte as fill character */ - ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, STRSAFE_FILL_BEHIND | 0xFF, FormatStringInts, 1, 2, 3), STATUS_SUCCESS); - - ok_eq_uint(UsString.Length, sizeof(Result) - sizeof(WCHAR)); - ok_eq_uint(UsString.MaximumLength, sizeof(Buffer)); - ok_eq_uint(memcmp(UsString.Buffer, Result, sizeof(Result) - sizeof(WCHAR)), 0); + /* STATUS_BUFFER_OVERFLOW test */ + BufferSize = 8 * sizeof(WCHAR); + pBuffer = KmtAllocateGuarded(BufferSize); + if (!pBuffer) + goto Cleanup; + + RtlInitEmptyUnicodeString(&UsString, pBuffer, BufferSize); + RtlInitEmptyUnicodeString(&RemString, NULL, 0); + + Status = RtlUnicodeStringPrintfEx(&UsString, &RemString, 0, FormatStringStrs, L"AAA", L"BBB", L"CCC"); + EqualBytes = RtlCompareMemory(UsString.Buffer, L"AAA BBB ", UsString.Length); + ok_eq_hex(Status, STATUS_BUFFER_OVERFLOW); + ok_eq_size(EqualBytes, UsString.Length); + ok_eq_uint(UsString.Length, UsString.MaximumLength); - ok_eq_pointer(RemString.Buffer, UsString.Buffer + (UsString.Length / sizeof(WCHAR))); + ok_eq_pointer(RemString.Buffer, &UsString.Buffer[UsString.Length / sizeof(WCHAR)]); ok_eq_uint(RemString.Length, 0); - ok_eq_uint(RemString.MaximumLength, UsString.MaximumLength - UsString.Length); + ok_eq_uint(RemString.MaximumLength, 0); - /* STATUS_BUFFER_OVERFLOW test */ + KmtFreeGuarded(pBuffer); + pBuffer = NULL; - UsString.Buffer = BufferSmall; - UsString.Length = 0; - UsString.MaximumLength = sizeof(BufferSmall); - RemString.Buffer = (PWCH)NULL; - RemString.Length = 0; - RemString.MaximumLength = 0; - - ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, 0, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_BUFFER_OVERFLOW); - ok_eq_uint(UsString.Length, UsString.MaximumLength); - ok_eq_char(UsString.Buffer[0], L'A'); - ok_eq_char(UsString.Buffer[1], L'A'); - ok_eq_char(UsString.Buffer[2], L'A'); - ok_eq_char(UsString.Buffer[3], L' '); - ok_eq_char(UsString.Buffer[4], L'B'); - ok_eq_char(UsString.Buffer[5], L'B'); - ok_eq_char(UsString.Buffer[6], L'B'); - ok_eq_char(UsString.Buffer[7], (WCHAR)0); - - // Takes \0 into account - ok_eq_pointer(RemString.Buffer, UsString.Buffer + (UsString.Length - 1) / sizeof(WCHAR)); - ok_eq_uint(RemString.Length, 0); - ok_eq_uint(RemString.MaximumLength, 2); - - /* Test for buffer overruns */ - - RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); - RtlFillMemory(OvrBuffer, sizeof(OvrBuffer), 0xAA); - UsString.Buffer = Buffer; - UsString.Length = 0; - UsString.MaximumLength = 16 * sizeof(WCHAR); - - ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, 0, FormatStringStrs, L"abc", L"def", L"ghi"), STATUS_SUCCESS); - ok_eq_uint(UsString.Length, sizeof(L"abc def ghi") - sizeof(WCHAR)); - ok_eq_char(UsString.Buffer[11], (WCHAR)0); - ok_eq_uint(0, memcmp(OvrBuffer + 12, Buffer + 12, sizeof(Buffer) - (12 * sizeof(WCHAR)))); + // Note: RtlUnicodeStringPrintf returns STATUS_BUFFER_OVERFLOW here while RtlUnicodeStringPrintfEx returns STATUS_INVALID_PARAMETER! + // Documented on MSDN and verified with the Win10 version of ntstrsafe.h + RtlInitEmptyUnicodeString(&UsString, NULL, 0); + Status = RtlUnicodeStringPrintfEx(&UsString, NULL, 0, FormatStringStrs, L"AAA", L"BBB", L"CCC"); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + +Cleanup: + if (pBuffer) + KmtFreeGuarded(pBuffer); + + // None of these functions should have crashed. + KmtEndSeh(STATUS_SUCCESS); } START_TEST(RtlStrSafe) diff --git a/sdk/include/ddk/ntstrsafe.h b/sdk/include/ddk/ntstrsafe.h index fac1a46f723..2780efe76e7 100644 --- a/sdk/include/ddk/ntstrsafe.h +++ b/sdk/include/ddk/ntstrsafe.h @@ -15,20 +15,6 @@ #pragma warning(disable:28719) /* disable banned api usage warning */ #endif /* _MSC_VER */ -#ifndef C_ASSERT -#ifdef _MSC_VER -# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] -#else -# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) -#endif -#endif /* C_ASSERT */ - -#ifdef __cplusplus -#define _STRSAFE_EXTERN_C extern "C" -#else -#define _STRSAFE_EXTERN_C extern -#endif - #define NTSTRSAFEAPI static __inline NTSTATUS NTAPI #define NTSTRSAFEVAPI static __inline NTSTATUS __cdecl #define NTSTRSAFE_INLINE_API static __inline NTSTATUS NTAPI @@ -92,10 +78,8 @@ NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_ NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, size_t cchToAppend, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszFormat, va_list argList); NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszFormat, va_list argList); -NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszFormat, size_t* pcchDestNewLen, va_list argList); NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCSTR pszFormat, va_list argList); NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, va_list argList); -NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, size_t* pcchDestNewLen, va_list argList); NTSTRSAFEAPI RtlUnicodeStringValidate(PCUNICODE_STRING SourceString); NTSTRSAFEAPI @@ -1366,6 +1350,7 @@ RtlStringCbPrintfExW( { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } @@ -2842,6 +2827,29 @@ NTSTRSAFEAPI RtlStringVPrintfWorkerA( return Status; } +NTSTRSAFEAPI RtlpArrayVPrintfWorkerW( + STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, + va_list argList) +{ + NTSTATUS Status = STATUS_SUCCESS; + int iRet = _vsnwprintf(pszDest, cchDest, pszFormat, argList); + + if ((iRet < 0) || (((size_t)iRet) > cchDest)) + { + Status = STATUS_BUFFER_OVERFLOW; + *pcchDestNewLen = cchDest; + } + else + { + *pcchDestNewLen = iRet; + } + + return Status; +} + NTSTRSAFEAPI RtlpStringVPrintfWorkerW( STRSAFE_LPWSTR pszDest, size_t cchDest, @@ -2883,19 +2891,6 @@ NTSTRSAFEAPI RtlStringVPrintfWorkerW( return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, NULL, argList); } -NTSTRSAFEAPI RtlStringVPrintfWorkerLenW( - STRSAFE_LPWSTR pszDest, - size_t cchDest, - STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, - va_list argList) -{ - if (cchDest == 0 || pcchDestNewLen == 0) - return STATUS_INVALID_PARAMETER; - - return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, pcchDestNewLen, argList); -} - NTSTRSAFEAPI RtlStringVPrintfExWorkerA( STRSAFE_LPSTR pszDest, size_t cchDest, @@ -3068,35 +3063,19 @@ NTSTRSAFEAPI RtlpStringVPrintfExWorkerW( } else { - int iRet; - size_t cchMax = cchDest - 1; - iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); - if ((iRet < 0) || (((size_t)iRet) > cchMax)) - { - pszDestEnd = pszDest + cchMax; - cchRemaining = 1; - *pszDestEnd = L'\0'; - Status = STATUS_BUFFER_OVERFLOW; - } - else if (((size_t)iRet) == cchMax) - { - pszDestEnd = pszDest + cchMax; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } - else if (((size_t)iRet) < cchMax) - { - pszDestEnd = pszDest + iRet; - cchRemaining = cchDest - iRet; + size_t cchDestNewLen = 0; - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); - } + Status = RtlpArrayVPrintfWorkerW(pszDest, cchDest, pszFormat, &cchDestNewLen, argList); + pszDestEnd = pszDest + cchDestNewLen; + cchRemaining = cchDest - cchDestNewLen; + + if (NT_SUCCESS(Status) && (dwFlags & STRSAFE_FILL_BEHIND) && cchRemaining) + { + memset(pszDestEnd, STRSAFE_GET_FILL_PATTERN(dwFlags), (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); } if (pcchDestNewLen) - *pcchDestNewLen = iRet == -1 ? cchDest : iRet; + *pcchDestNewLen = cchDestNewLen; } } } @@ -3120,6 +3099,7 @@ NTSTRSAFEAPI RtlpStringVPrintfExWorkerW( *pszDestEnd = L'\0'; } } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { if (cchDest > 0) @@ -3157,24 +3137,6 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerW( return RtlpStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, NULL, argList); } -NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW( - STRSAFE_LPWSTR pszDest, - size_t cchDest, - size_t cbDest, - STRSAFE_LPWSTR *ppszDestEnd, - size_t *pcchRemaining, - STRSAFE_DWORD dwFlags, - STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, - va_list argList) -{ - if (pcchDestNewLen == 0) - return STATUS_INVALID_PARAMETER; - - return RtlpStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, pcchDestNewLen, argList); -} - - NTSTRSAFEAPI RtlStringLengthWorkerA( _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, @@ -3285,7 +3247,7 @@ RtlUnicodeStringPrintf( size_t cchFinalLength; va_list argList; - if (DestinationString == NULL || pszFormat == NULL || DestinationString->Buffer == NULL) + if (DestinationString == NULL || pszFormat == NULL) { Status = STATUS_INVALID_PARAMETER; } @@ -3296,7 +3258,7 @@ RtlUnicodeStringPrintf( { va_start(argList, pszFormat); - Status = RtlStringVPrintfWorkerLenW(DestinationString->Buffer, + Status = RtlpArrayVPrintfWorkerW(DestinationString->Buffer, DestinationString->MaximumLength / sizeof(WCHAR), pszFormat, &cchFinalLength, @@ -3328,7 +3290,7 @@ RtlUnicodeStringPrintfEx( va_start(argList, pszFormat); - Status = RtlStringVPrintfExWorkerLenW(DestinationString->Buffer, + Status = RtlpStringVPrintfExWorkerW(DestinationString->Buffer, DestinationString->MaximumLength / sizeof(WCHAR), DestinationString->MaximumLength, &RemainingString->Buffer,

1 0

[reactos] 03/04: Fix and unify function prototypes for ntstrsafe functions taking variadic arguments.
by Colin Finck 28 Aug '19

28 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ed46c73f3fb5d92aac8… commit 46ed46c73f3fb5d92aac8bef2e99f905ca319e2b Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Aug 19 17:38:05 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Aug 28 22:35:01 2019 +0200 Fix and unify function prototypes for ntstrsafe functions taking variadic arguments. --- sdk/include/ddk/ntstrsafe.h | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/sdk/include/ddk/ntstrsafe.h b/sdk/include/ddk/ntstrsafe.h index ab338bc58a0..fac1a46f723 100644 --- a/sdk/include/ddk/ntstrsafe.h +++ b/sdk/include/ddk/ntstrsafe.h @@ -30,6 +30,7 @@ #endif #define NTSTRSAFEAPI static __inline NTSTATUS NTAPI +#define NTSTRSAFEVAPI static __inline NTSTATUS __cdecl #define NTSTRSAFE_INLINE_API static __inline NTSTATUS NTAPI #ifndef NTSTRSAFE_MAX_CCH @@ -1082,21 +1083,21 @@ RtlStringCbVPrintfW( return RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfA( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cchDest, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfW( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cchDest, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfA( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cchDest, @@ -1121,7 +1122,7 @@ RtlStringCchPrintfA( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfW( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cchDest, @@ -1145,21 +1146,21 @@ RtlStringCchPrintfW( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfA( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cbDest, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfW( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cbDest, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfA( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cbDest, @@ -1184,7 +1185,7 @@ RtlStringCbPrintfA( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfW( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cbDest, @@ -1209,7 +1210,7 @@ RtlStringCbPrintfW( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfExA( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cchDest, @@ -1219,7 +1220,7 @@ RtlStringCchPrintfExA( _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfExW( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cchDest, @@ -1229,7 +1230,7 @@ RtlStringCchPrintfExW( _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfExA( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cchDest, @@ -1257,7 +1258,7 @@ RtlStringCchPrintfExA( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCchPrintfExW( _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cchDest, @@ -1285,7 +1286,7 @@ RtlStringCchPrintfExW( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfExA( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cbDest, @@ -1295,7 +1296,7 @@ RtlStringCbPrintfExA( _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfExW( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cbDest, @@ -1305,7 +1306,7 @@ RtlStringCbPrintfExW( _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, ...); -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfExA( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _In_ size_t cbDest, @@ -1346,7 +1347,7 @@ RtlStringCbPrintfExA( return Status; } -static __inline NTSTATUS +NTSTRSAFEVAPI RtlStringCbPrintfExW( _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _In_ size_t cbDest, @@ -3274,9 +3275,7 @@ RtlUnicodeStringValidateEx( return RtlpUnicodeStringValidate(SourceString, dwFlags); } -static -NTSTATUS -__cdecl +NTSTRSAFEVAPI RtlUnicodeStringPrintf( _In_ PUNICODE_STRING DestinationString, _In_ NTSTRSAFE_PCWSTR pszFormat, @@ -3315,9 +3314,7 @@ RtlUnicodeStringPrintf( return Status; } -static -NTSTATUS -__cdecl +NTSTRSAFEVAPI RtlUnicodeStringPrintfEx( _In_opt_ PUNICODE_STRING DestinationString, _In_opt_ PUNICODE_STRING RemainingString,

1 0

[reactos] 02/04: [FORMATTING] Restore some kind of style to ntstrsafe.h, considering all comments in PR #522 and #523.
by Colin Finck 28 Aug '19

28 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=331e3312095cc97feb986… commit 331e3312095cc97feb9866155352d19847c8a7d3 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Aug 19 15:58:30 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Aug 28 22:32:49 2019 +0200 [FORMATTING] Restore some kind of style to ntstrsafe.h, considering all comments in PR #522 and #523. --- sdk/include/ddk/ntstrsafe.h | 2450 ++++++++++++++++++++++++------------------- 1 file changed, 1355 insertions(+), 1095 deletions(-) diff --git a/sdk/include/ddk/ntstrsafe.h b/sdk/include/ddk/ntstrsafe.h index de2a4921f1f..ab338bc58a0 100644 --- a/sdk/include/ddk/ntstrsafe.h +++ b/sdk/include/ddk/ntstrsafe.h @@ -73,64 +73,65 @@ typedef _Null_terminated_ const wchar_t *NTSTRSAFE_PCWSTR; typedef ULONG STRSAFE_DWORD; -NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc); -NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc); -NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToCopy); -NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy); -NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cchToCopy,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc); -NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc); -NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend); -NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend); -NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); -NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszFormat,va_list argList); -NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,va_list argList); -NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,size_t* pcchDestNewLen, va_list argList); -NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCSTR pszFormat,va_list argList); -NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCWSTR pszFormat,va_list argList); +NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc); +NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc); +NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc, size_t cchToCopy); +NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc, size_t cchToCopy); +NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, size_t cchToCopy, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, size_t cchToCopy, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc); +NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc); +NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc, size_t cchToAppend); +NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc, size_t cchToAppend); +NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, size_t cchToAppend, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, size_t cchToAppend, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags); +NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszFormat, va_list argList); +NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszFormat, va_list argList); +NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszFormat, size_t* pcchDestNewLen, va_list argList); +NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCSTR pszFormat, va_list argList); +NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, va_list argList); NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, size_t* pcchDestNewLen, va_list argList); NTSTRSAFEAPI RtlUnicodeStringValidate(PCUNICODE_STRING SourceString); NTSTRSAFEAPI RtlStringLengthWorkerA( - _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength); + _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength); NTSTRSAFEAPI RtlStringLengthWorkerW( - _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, - _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength); + _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, + _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength); NTSTRSAFEAPI RtlStringCchCopyA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc); NTSTRSAFEAPI RtlStringCchCopyW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc); NTSTRSAFEAPI RtlStringCchCopyA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } @@ -139,108 +140,115 @@ RtlStringCchCopyA( NTSTRSAFEAPI RtlStringCchCopyW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); + return RtlStringCopyWorkerW(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI RtlStringCbCopyA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc); NTSTRSAFEAPI RtlStringCbCopyW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc); NTSTRSAFEAPI RtlStringCbCopyA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc) { size_t cchDest = cbDest / sizeof(char); + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyWorkerA(pszDest,cbDest,pszSrc); + return RtlStringCopyWorkerA(pszDest, cbDest, pszSrc); } NTSTRSAFEAPI RtlStringCbCopyW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc) { size_t cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); + return RtlStringCopyWorkerW(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI RtlStringCchCopyExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCopyExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCopyExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); + + return RtlStringCopyExWorkerA(pszDest, cchDest, cchDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCchCopyExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { size_t cbDest = cchDest * sizeof(wchar_t); @@ -248,38 +256,39 @@ RtlStringCchCopyExW( { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); + return RtlStringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCbCopyExA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCopyExW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCopyExA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchDest = cbDest / sizeof(char); @@ -289,26 +298,27 @@ RtlStringCbCopyExA( { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - Status = RtlStringCopyExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCopyExWorkerA(pszDest, cbDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) { if (pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); } return Status; } NTSTRSAFEAPI RtlStringCbCopyExW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchDest = cbDest / sizeof(wchar_t); @@ -318,95 +328,99 @@ RtlStringCbCopyExW( { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - Status = RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + Status = RtlStringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); } return Status; } NTSTRSAFEAPI RtlStringCchCopyNA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToCopy); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToCopy); NTSTRSAFEAPI RtlStringCchCopyNW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToCopy); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToCopy); NTSTRSAFEAPI RtlStringCchCopyNA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToCopy) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToCopy) { if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy); + return RtlStringCopyNWorkerA(pszDest, cchDest, pszSrc, cchToCopy); } NTSTRSAFEAPI RtlStringCchCopyNW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToCopy) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToCopy) { if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy); + return RtlStringCopyNWorkerW(pszDest, cchDest, pszSrc, cchToCopy); } NTSTRSAFEAPI RtlStringCbCopyNA( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToCopy); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToCopy); NTSTRSAFEAPI RtlStringCbCopyNW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToCopy); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToCopy); NTSTRSAFEAPI RtlStringCbCopyNA( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToCopy) + _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToCopy) { - size_t cchDest = cbDest / sizeof(char); + size_t cchDest = cbDest / sizeof(char); size_t cchToCopy = cbToCopy / sizeof(char); if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } @@ -415,18 +429,19 @@ RtlStringCbCopyNA( NTSTRSAFEAPI RtlStringCbCopyNW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToCopy) + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToCopy) { - size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchDest = cbDest / sizeof(wchar_t); size_t cchToCopy = cbToCopy / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } @@ -435,38 +450,39 @@ RtlStringCbCopyNW( NTSTRSAFEAPI RtlStringCchCopyNExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToCopy, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToCopy, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCopyNExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToCopy, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToCopy, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCopyNExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToCopy, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToCopy, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } @@ -475,53 +491,54 @@ RtlStringCchCopyNExA( NTSTRSAFEAPI RtlStringCchCopyNExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToCopy, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToCopy, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringCopyNExWorkerW(pszDest,cchDest,cchDest * sizeof(wchar_t), pszSrc, cchToCopy, ppszDestEnd, pcchRemaining, dwFlags); + return RtlStringCopyNExWorkerW(pszDest, cchDest, cchDest * sizeof(wchar_t), pszSrc, cchToCopy, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCbCopyNExA( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToCopy, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToCopy, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCopyNExW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToCopy, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToCopy, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCopyNExA( - _Out_writes_bytes_(cbDest) STRSAFE_LPSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToCopy, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_bytes_(cbDest) STRSAFE_LPSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToCopy, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) STRSAFE_LPSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchRemaining = 0; @@ -530,206 +547,219 @@ RtlStringCbCopyNExA( { if ((pszDest != NULL) && (cbDest > 0)) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - Status = RtlStringCopyNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToCopy,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCopyNExWorkerA(pszDest, cbDest, cbDest, pszSrc, cbToCopy, ppszDestEnd, &cchRemaining, dwFlags); if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) *pcbRemaining = cchRemaining; + return Status; } NTSTRSAFEAPI RtlStringCbCopyNExW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToCopy, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToCopy) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToCopy, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; - size_t cchDest; - size_t cchToCopy; + size_t cchDest = cbDest / sizeof(wchar_t); + size_t cchToCopy = cbToCopy / sizeof(wchar_t); size_t cchRemaining = 0; - cchDest = cbDest / sizeof(wchar_t); - cchToCopy = cbToCopy / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) { if ((pszDest != NULL) && (cbDest > 0)) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - Status = RtlStringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCopyNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchToCopy, ppszDestEnd, &cchRemaining, dwFlags); if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return Status; } NTSTRSAFEAPI RtlStringCchCatA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc); NTSTRSAFEAPI RtlStringCchCatW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc); NTSTRSAFEAPI RtlStringCchCatA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatWorkerA(pszDest,cchDest,pszSrc); + + return RtlStringCatWorkerA(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI RtlStringCchCatW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatWorkerW(pszDest,cchDest,pszSrc); + + return RtlStringCatWorkerW(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI RtlStringCbCatA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc); NTSTRSAFEAPI RtlStringCbCatW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc); NTSTRSAFEAPI RtlStringCbCatA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc) { if (cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatWorkerA(pszDest,cbDest,pszSrc); + return RtlStringCatWorkerA(pszDest, cbDest, pszSrc); } NTSTRSAFEAPI RtlStringCbCatW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc) { size_t cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatWorkerW(pszDest,cchDest,pszSrc); + + return RtlStringCatWorkerW(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI RtlStringCchCatExA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCatExW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCatExA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); + + return RtlStringCatExWorkerA(pszDest, cchDest, cchDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCchCatExW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) -{ - size_t cbDest = cchDest*sizeof(wchar_t); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) +{ + size_t cbDest = cchDest * sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); + + return RtlStringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCbCatExA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCatExW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCatExA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchRemaining = 0; + if (cbDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringCatExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCatExWorkerA(pszDest, cbDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + return Status; } NTSTRSAFEAPI RtlStringCbCatExW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ NTSTRSAFE_PCWSTR pszSrc, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ NTSTRSAFE_PCWSTR pszSrc, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchDest = cbDest / sizeof(wchar_t); @@ -738,510 +768,552 @@ RtlStringCbCatExW( if (cchDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return Status; } NTSTRSAFEAPI RtlStringCchCatNA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToAppend); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToAppend); NTSTRSAFEAPI RtlStringCchCatNW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToAppend); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToAppend); NTSTRSAFEAPI RtlStringCchCatNA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToAppend) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToAppend) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNWorkerA(pszDest,cchDest,pszSrc,cchToAppend); + + return RtlStringCatNWorkerA(pszDest, cchDest, pszSrc, cchToAppend); } NTSTRSAFEAPI RtlStringCchCatNW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToAppend) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToAppend) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend); + + return RtlStringCatNWorkerW(pszDest, cchDest, pszSrc, cchToAppend); } NTSTRSAFEAPI RtlStringCbCatNA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToAppend); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToAppend); NTSTRSAFEAPI RtlStringCbCatNW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToAppend); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToAppend); NTSTRSAFEAPI RtlStringCbCatNA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToAppend) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToAppend) { if (cbDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNWorkerA(pszDest,cbDest,pszSrc,cbToAppend); + + return RtlStringCatNWorkerA(pszDest, cbDest, pszSrc, cbToAppend); } NTSTRSAFEAPI RtlStringCbCatNW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToAppend) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToAppend) { size_t cchDest = cbDest / sizeof(wchar_t); size_t cchToAppend = cbToAppend / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend); + + return RtlStringCatNWorkerW(pszDest, cchDest, pszSrc, cchToAppend); } NTSTRSAFEAPI RtlStringCchCatNExA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToAppend, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToAppend, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCatNExW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToAppend, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToAppend, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCchCatNExA( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cchToAppend, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cchToAppend, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags); + + return RtlStringCatNExWorkerA(pszDest, cchDest, cchDest, pszSrc, cchToAppend, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCchCatNExW( - _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cchToAppend, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_reads_or_z_(cchToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cchToAppend, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) return STATUS_INVALID_PARAMETER; - return RtlStringCatNExWorkerW(pszDest,cchDest,(cchDest*sizeof(wchar_t)),pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags); + + return RtlStringCatNExWorkerW(pszDest, cchDest, (cchDest * sizeof(wchar_t)), pszSrc, cchToAppend, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI RtlStringCbCatNExA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToAppend, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToAppend, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCatNExW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToAppend, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags); + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToAppend, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringCbCatNExA( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, - _In_ size_t cbToAppend, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCSTR pszSrc, + _In_ size_t cbToAppend, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchRemaining = 0; + if (cbDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringCatNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToAppend,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCatNExWorkerA(pszDest, cbDest, cbDest, pszSrc, cbToAppend, ppszDestEnd, &cchRemaining, dwFlags); + if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + return Status; } NTSTRSAFEAPI RtlStringCbCatNExW( - _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, - _In_ size_t cbToAppend, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags) + _Inout_updates_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_reads_bytes_(cbToAppend) STRSAFE_LPCWSTR pszSrc, + _In_ size_t cbToAppend, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; size_t cchDest = cbDest / sizeof(wchar_t); size_t cchToAppend = cbToAppend / sizeof(wchar_t); size_t cchRemaining = 0; + if (cchDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringCatNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,&cchRemaining,dwFlags); + Status = RtlStringCatNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchToAppend, ppszDestEnd, &cchRemaining, dwFlags); + if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + return Status; } NTSTRSAFEAPI RtlStringCchVPrintfA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCchVPrintfW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCchVPrintfA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); + return RtlStringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); } NTSTRSAFEAPI RtlStringCchVPrintfW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList) { if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + + return RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); } NTSTRSAFEAPI RtlStringCbVPrintfA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCbVPrintfW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCbVPrintfA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList) { if (cbDest > NTSTRSAFE_MAX_CCH) { if (cbDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - return RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); + + return RtlStringVPrintfWorkerA(pszDest, cbDest, pszFormat, argList); } NTSTRSAFEAPI RtlStringCbVPrintfW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList) { size_t cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; return STATUS_INVALID_PARAMETER; } - return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + + return RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); } static __inline NTSTATUS RtlStringCchPrintfA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCchPrintfW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCchPrintfA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...) { NTSTATUS Status; va_list argList; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCchPrintfW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...) { NTSTATUS Status; va_list argList; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCbPrintfA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCbPrintfW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCbPrintfA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...) { NTSTATUS Status; va_list argList; + if (cbDest > NTSTRSAFE_MAX_CCH) { if (cbDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfWorkerA(pszDest, cbDest, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCbPrintfW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...) { NTSTATUS Status; va_list argList; size_t cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCchPrintfExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCchPrintfExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCchPrintfExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...) { NTSTATUS Status; va_list argList; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfExWorkerA(pszDest,cchDest,cchDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfExWorkerA(pszDest, cchDest, cchDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCchPrintfExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...) { NTSTATUS Status; size_t cbDest = cchDest * sizeof(wchar_t); va_list argList; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; return STATUS_INVALID_PARAMETER; } - va_start(argList,pszFormat); - Status = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + + va_start(argList, pszFormat); + Status = RtlStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); va_end(argList); + return Status; } static __inline NTSTATUS RtlStringCbPrintfExA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCbPrintfExW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...); + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...); static __inline NTSTATUS RtlStringCbPrintfExA( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - ...) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + ...) { NTSTATUS Status; size_t cchDest; @@ -1252,39 +1324,43 @@ RtlStringCbPrintfExA( { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } { va_list argList; - va_start(argList,pszFormat); - Status = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + va_start(argList, pszFormat); + Status = RtlStringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); va_end(argList); } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (pcbRemaining) { - *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); } } + return Status; } static __inline NTSTATUS RtlStringCbPrintfExW( - _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - ...) + _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + ...) { NTSTATUS Status; size_t cchDest; size_t cchRemaining = 0; cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) @@ -1294,15 +1370,16 @@ RtlStringCbPrintfExW( { va_list argList; - va_start(argList,pszFormat); - Status = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); + va_start(argList, pszFormat); + Status = RtlStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); va_end(argList); } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (pcbRemaining) { - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); } } return Status; @@ -1310,149 +1387,161 @@ RtlStringCbPrintfExW( NTSTRSAFEAPI RtlStringCchVPrintfExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCchVPrintfExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList); + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCchVPrintfExA( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList) { NTSTATUS Status; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; } { size_t cbDest; - cbDest = cchDest*sizeof(char); - Status = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + cbDest = cchDest * sizeof(char); + Status = RtlStringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); } + return Status; } NTSTRSAFEAPI RtlStringCchVPrintfExW( - _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cchDest, - _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcchRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList) + _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cchDest, + _Outptr_opt_result_buffer_(*pcchRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcchRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList) { NTSTATUS Status; + if (cchDest > NTSTRSAFE_MAX_CCH) { if (cchDest > 0) *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; } { size_t cbDest; - cbDest = cchDest*sizeof(wchar_t); - Status = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); + cbDest = cchDest * sizeof(wchar_t); + Status = RtlStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); } + return Status; } NTSTRSAFEAPI RtlStringCbVPrintfExA( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCbVPrintfExW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList); + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList); NTSTRSAFEAPI RtlStringCbVPrintfExA( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, - _In_ va_list argList) + _Out_writes_bytes_(cbDest) NTSTRSAFE_PSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, + _In_ va_list argList) { NTSTATUS Status; size_t cchDest; size_t cchRemaining = 0; cchDest = cbDest / sizeof(char); + if (cchDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + Status = RtlStringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (pcbRemaining) { - *pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char)); + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); } } + return Status; } NTSTRSAFEAPI RtlStringCbVPrintfExW( - _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, - _In_ size_t cbDest, - _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, - _Out_opt_ size_t *pcbRemaining, - _In_ STRSAFE_DWORD dwFlags, - _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, - _In_ va_list argList) + _Out_writes_bytes_(cbDest) NTSTRSAFE_PWSTR pszDest, + _In_ size_t cbDest, + _Outptr_opt_result_bytebuffer_(*pcbRemaining) NTSTRSAFE_PWSTR *ppszDestEnd, + _Out_opt_ size_t *pcbRemaining, + _In_ STRSAFE_DWORD dwFlags, + _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, + _In_ va_list argList) { NTSTATUS Status; size_t cchDest; size_t cchRemaining = 0; cchDest = cbDest / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,&cchRemaining,dwFlags,pszFormat,argList); - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + Status = RtlStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (pcbRemaining) { - *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); } } + return Status; } @@ -1460,176 +1549,203 @@ RtlStringCbVPrintfExW( _Must_inspect_result_ NTSTRSAFEAPI RtlStringCchLengthA( - _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) _Deref_out_range_(<=, _String_length_(psz)) size_t *pcchLength); + _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(< , cchMax) _Deref_out_range_(<= , _String_length_(psz)) size_t *pcchLength); _Must_inspect_result_ NTSTRSAFEAPI RtlStringCchLengthW( - _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) _Deref_out_range_(<=, _String_length_(psz)) size_t *pcchLength); + _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(< , cchMax) _Deref_out_range_(<= , _String_length_(psz)) size_t *pcchLength); _Must_inspect_result_ NTSTRSAFEAPI RtlStringCchLengthA( - _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) _Deref_out_range_(<=, _String_length_(psz)) size_t *pcchLength) + _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(< , cchMax) _Deref_out_range_(<= , _String_length_(psz)) size_t *pcchLength) { NTSTATUS Status; + if (!psz || (cchMax > NTSTRSAFE_MAX_CCH)) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringLengthWorkerA(psz,cchMax,pcchLength); + Status = RtlStringLengthWorkerA(psz, cchMax, pcchLength); + if (!NT_SUCCESS(Status) && pcchLength) { *pcchLength = 0; } + return Status; } _Must_inspect_result_ NTSTRSAFEAPI RtlStringCchLengthW( - _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) _Deref_out_range_(<=, _String_length_(psz)) size_t *pcchLength) + _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(< , cchMax) _Deref_out_range_(<= , _String_length_(psz)) size_t *pcchLength) { NTSTATUS Status; + if (!psz || (cchMax > NTSTRSAFE_MAX_CCH)) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringLengthWorkerW(psz,cchMax,pcchLength); + Status = RtlStringLengthWorkerW(psz, cchMax, pcchLength); + if (!NT_SUCCESS(Status) && pcchLength) { *pcchLength = 0; } + return Status; } _Must_inspect_result_ NTSTRSAFEAPI RtlStringCbLengthA( - _In_reads_or_z_(cbMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(char)) size_t cbMax, - _Out_opt_ _Deref_out_range_(<, cbMax) size_t *pcbLength); + _In_reads_or_z_(cbMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(char)) size_t cbMax, + _Out_opt_ _Deref_out_range_(< , cbMax) size_t *pcbLength); _Must_inspect_result_ NTSTRSAFEAPI RtlStringCbLengthW( - _In_reads_or_z_(cbMax / sizeof(wchar_t)) STRSAFE_LPCWSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(wchar_t)) size_t cbMax, - _Out_opt_ _Deref_out_range_(<, cbMax - 1) size_t *pcbLength); + _In_reads_or_z_(cbMax / sizeof(wchar_t)) STRSAFE_LPCWSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(wchar_t)) size_t cbMax, + _Out_opt_ _Deref_out_range_(< , cbMax - 1) size_t *pcbLength); _Must_inspect_result_ NTSTRSAFEAPI RtlStringCbLengthA( - _In_reads_or_z_(cbMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(char)) size_t cbMax, - _Out_opt_ _Deref_out_range_(<, cbMax) size_t *pcbLength) + _In_reads_or_z_(cbMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(char)) size_t cbMax, + _Out_opt_ _Deref_out_range_(< , cbMax) size_t *pcbLength) { NTSTATUS Status; size_t cchMax; size_t cchLength = 0; cchMax = cbMax / sizeof(char); + if (!psz || (cchMax > NTSTRSAFE_MAX_CCH)) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringLengthWorkerA(psz,cchMax,&cchLength); + Status = RtlStringLengthWorkerA(psz, cchMax, &cchLength); + if (pcbLength) { if (NT_SUCCESS(Status)) { - *pcbLength = cchLength*sizeof(char); + *pcbLength = cchLength * sizeof(char); } else { *pcbLength = 0; } } + return Status; } _Must_inspect_result_ NTSTRSAFEAPI RtlStringCbLengthW( - _In_reads_or_z_(cbMax / sizeof(wchar_t)) STRSAFE_LPCWSTR psz, - _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(wchar_t)) size_t cbMax, - _Out_opt_ _Deref_out_range_(<, cbMax - 1) size_t *pcbLength) + _In_reads_or_z_(cbMax / sizeof(wchar_t)) STRSAFE_LPCWSTR psz, + _In_ _In_range_(1, NTSTRSAFE_MAX_CCH * sizeof(wchar_t)) size_t cbMax, + _Out_opt_ _Deref_out_range_(< , cbMax - 1) size_t *pcbLength) { NTSTATUS Status; size_t cchMax; size_t cchLength = 0; cchMax = cbMax / sizeof(wchar_t); + if (!psz || (cchMax > NTSTRSAFE_MAX_CCH)) Status = STATUS_INVALID_PARAMETER; else - Status = RtlStringLengthWorkerW(psz,cchMax,&cchLength); + Status = RtlStringLengthWorkerW(psz, cchMax, &cchLength); + if (pcbLength) { if (NT_SUCCESS(Status)) { - *pcbLength = cchLength*sizeof(wchar_t); + *pcbLength = cchLength * sizeof(wchar_t); } else { *pcbLength = 0; } } + return Status; } -NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCopyWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) + + if (cchDest == 0) + { Status = STATUS_INVALID_PARAMETER; + } else { - while(cchDest && (*pszSrc!='\0')) + while (cchDest && (*pszSrc != '\0')) { *pszDest++ = *pszSrc++; cchDest--; } - if (cchDest==0) + + if (cchDest == 0) { pszDest--; Status = STATUS_BUFFER_OVERFLOW; } - *pszDest= '\0'; + + *pszDest = '\0'; } + return Status; } -NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCopyWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) + + if (cchDest == 0) + { Status = STATUS_INVALID_PARAMETER; + } else { - while(cchDest && (*pszSrc!=L'\0')) + while (cchDest && (*pszSrc != L'\0')) { *pszDest++ = *pszSrc++; cchDest--; } - if (cchDest==0) + + if (cchDest == 0) { pszDest--; Status = STATUS_BUFFER_OVERFLOW; } - *pszDest= L'\0'; + + *pszDest = L'\0'; } + return Status; } -NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCopyExWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, @@ -1640,27 +1756,33 @@ NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { if (dwFlags & STRSAFE_IGNORE_NULLS) { if (!pszDest) { - if ((cchDest!=0) || (cbDest!=0)) + if ((cchDest != 0) || (cbDest != 0)) Status = STATUS_INVALID_PARAMETER; } + if (!pszSrc) pszSrc = ""; } + if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { pszDestEnd = pszDest; cchRemaining = 0; - if (*pszSrc!='\0') + + if (*pszSrc != '\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -1672,16 +1794,18 @@ NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, { pszDestEnd = pszDest; cchRemaining = cchDest; - while(cchRemaining && (*pszSrc!='\0')) + + while (cchRemaining && (*pszSrc != '\0')) { *pszDestEnd++ = *pszSrc++; cchRemaining--; } + if (cchRemaining > 0) { if (dwFlags & STRSAFE_FILL_BEHIND_NULL) { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); } } else @@ -1690,52 +1814,55 @@ NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, cchRemaining++; Status = STATUS_BUFFER_OVERFLOW; } + *pszDestEnd = '\0'; } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = '\0'; - } - } - if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = '\0'; } } + + if ((dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCopyExWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, @@ -1746,27 +1873,33 @@ NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { if (dwFlags & STRSAFE_IGNORE_NULLS) { if (!pszDest) { - if ((cchDest!=0) || (cbDest!=0)) + if ((cchDest != 0) || (cbDest != 0)) Status = STATUS_INVALID_PARAMETER; } + if (!pszSrc) pszSrc = L""; } + if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { pszDestEnd = pszDest; cchRemaining = 0; - if (*pszSrc!=L'\0') + + if (*pszSrc != L'\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -1778,16 +1911,18 @@ NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, { pszDestEnd = pszDest; cchRemaining = cchDest; - while(cchRemaining && (*pszSrc!=L'\0')) + + while (cchRemaining && (*pszSrc != L'\0')) { *pszDestEnd++ = *pszSrc++; cchRemaining--; } + if (cchRemaining > 0) { if (dwFlags & STRSAFE_FILL_BEHIND_NULL) { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); } } else @@ -1796,103 +1931,122 @@ NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, cchRemaining++; Status = STATUS_BUFFER_OVERFLOW; } + *pszDestEnd = L'\0'; } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } - } - if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = L'\0'; } } + + if ((dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCopyNWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, - STRSAFE_LPCSTR pszSrc,size_t cchSrc) + STRSAFE_LPCSTR pszSrc, + size_t cchSrc) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) + + if (cchDest == 0) + { Status = STATUS_INVALID_PARAMETER; + } else { - while(cchDest && cchSrc && (*pszSrc!='\0')) + while (cchDest && cchSrc && (*pszSrc != '\0')) { *pszDest++ = *pszSrc++; cchDest--; cchSrc--; } - if (cchDest==0) + + if (cchDest == 0) { pszDest--; Status = STATUS_BUFFER_OVERFLOW; } - *pszDest= '\0'; + + *pszDest = '\0'; } + return Status; } -NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCopyNWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc, size_t cchToCopy) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) + + if (cchDest == 0) + { Status = STATUS_INVALID_PARAMETER; + } else { - while(cchDest && cchToCopy && (*pszSrc!=L'\0')) + while (cchDest && cchToCopy && (*pszSrc != L'\0')) { *pszDest++ = *pszSrc++; cchDest--; cchToCopy--; } - if (cchDest==0) + + if (cchDest == 0) { pszDest--; Status = STATUS_BUFFER_OVERFLOW; } - *pszDest= L'\0'; + + *pszDest = L'\0'; } + return Status; } -NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCopyNExWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, @@ -1904,84 +2058,95 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { + Status = STATUS_INVALID_PARAMETER; + } + else if (cchToCopy > NTSTRSAFE_MAX_CCH) + { Status = STATUS_INVALID_PARAMETER; + } else - if (cchToCopy > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) { - if (dwFlags & STRSAFE_IGNORE_NULLS) + if (!pszDest) { - if (!pszDest) - { - if ((cchDest!=0) || (cbDest!=0)) - Status = STATUS_INVALID_PARAMETER; - } - if (!pszSrc) - pszSrc = ""; + if ((cchDest != 0) || (cbDest != 0)) + Status = STATUS_INVALID_PARAMETER; } - if (NT_SUCCESS(Status)) - { - if (cchDest==0) - { - pszDestEnd = pszDest; - cchRemaining = 0; - if ((cchToCopy!=0) && (*pszSrc!='\0')) - { - if (!pszDest) - Status = STATUS_INVALID_PARAMETER; - else - Status = STATUS_BUFFER_OVERFLOW; - } - } - else + + if (!pszSrc) + pszSrc = ""; + } + + if (NT_SUCCESS(Status)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + + if ((cchToCopy != 0) && (*pszSrc != '\0')) { - pszDestEnd = pszDest; - cchRemaining = cchDest; - while(cchRemaining && cchToCopy && (*pszSrc!='\0')) - { - *pszDestEnd++ = *pszSrc++; - cchRemaining--; - cchToCopy--; - } - if (cchRemaining > 0) - { - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); - } - } + if (!pszDest) + Status = STATUS_INVALID_PARAMETER; else - { - pszDestEnd--; - cchRemaining++; Status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + + while (cchRemaining && cchToCopy && (*pszSrc != '\0')) + { + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + cchToCopy--; + } + + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + { + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); } - *pszDestEnd = '\0'; } + else + { + pszDestEnd--; + cchRemaining++; + Status = STATUS_BUFFER_OVERFLOW; + } + + *pszDestEnd = '\0'; } } + } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = '\0'; - } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { if (cchDest > 0) @@ -1993,17 +2158,21 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest, } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCopyNExWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, @@ -2015,83 +2184,93 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } + else if (cchToCopy > NTSTRSAFE_MAX_CCH) + { + Status = STATUS_INVALID_PARAMETER; + } else - if (cchToCopy > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (!pszDest) + { + if ((cchDest != 0) || (cbDest != 0)) + Status = STATUS_INVALID_PARAMETER; + } + + if (!pszSrc) + pszSrc = L""; + } + + if (NT_SUCCESS(Status)) { - if (dwFlags & STRSAFE_IGNORE_NULLS) + if (cchDest == 0) { - if (!pszDest) + pszDestEnd = pszDest; + cchRemaining = 0; + + if ((cchToCopy != 0) && (*pszSrc != L'\0')) { - if ((cchDest!=0) || (cbDest!=0)) + if (!pszDest) Status = STATUS_INVALID_PARAMETER; + else + Status = STATUS_BUFFER_OVERFLOW; } - if (!pszSrc) - pszSrc = L""; } - if (NT_SUCCESS(Status)) + else { - if (cchDest==0) + pszDestEnd = pszDest; + cchRemaining = cchDest; + + while (cchRemaining && cchToCopy && (*pszSrc != L'\0')) { - pszDestEnd = pszDest; - cchRemaining = 0; - if ((cchToCopy!=0) && (*pszSrc!=L'\0')) + *pszDestEnd++ = *pszSrc++; + cchRemaining--; + cchToCopy--; + } + + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) { - if (!pszDest) - Status = STATUS_INVALID_PARAMETER; - else - Status = STATUS_BUFFER_OVERFLOW; + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); } } else { - pszDestEnd = pszDest; - cchRemaining = cchDest; - while(cchRemaining && cchToCopy && (*pszSrc!=L'\0')) - { - *pszDestEnd++ = *pszSrc++; - cchRemaining--; - cchToCopy--; - } - if (cchRemaining > 0) - { - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); - } - } - else - { - pszDestEnd--; - cchRemaining++; - Status = STATUS_BUFFER_OVERFLOW; - } - *pszDestEnd = L'\0'; + pszDestEnd--; + cchRemaining++; + Status = STATUS_BUFFER_OVERFLOW; } + + *pszDestEnd = L'\0'; } } + } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } } if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { @@ -2104,41 +2283,47 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest, } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCatWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc) { - NTSTATUS Status; size_t cchDestLength; - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + NTSTATUS Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) - Status = RtlStringCopyWorkerA(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc); + Status = RtlStringCopyWorkerA(pszDest + cchDestLength, cchDest - cchDestLength, pszSrc); + return Status; } -NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCatWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc) { - NTSTATUS Status; size_t cchDestLength; - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + NTSTATUS Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) - Status = RtlStringCopyWorkerW(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc); + Status = RtlStringCopyWorkerW(pszDest + cchDestLength, cchDest - cchDestLength, pszSrc); + return Status; } -NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCatExWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, @@ -2149,8 +2334,11 @@ NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { size_t cchDestLength; @@ -2158,37 +2346,39 @@ NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, { if (!pszDest) { - if ((cchDest==0) && (cbDest==0)) + if ((cchDest == 0) && (cbDest == 0)) cchDestLength = 0; else Status = STATUS_INVALID_PARAMETER; } else { - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + if (!pszSrc) pszSrc = ""; } else { - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { - if (*pszSrc!='\0') + if (*pszSrc != '\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -2197,51 +2387,55 @@ NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, } } else - Status = RtlStringCopyExWorkerA(pszDestEnd,cchRemaining,(cchRemaining*sizeof(char)) + (cbDest % sizeof(char)),pszSrc,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + { + Status = RtlStringCopyExWorkerA(pszDestEnd, cchRemaining, (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)), pszSrc, &pszDestEnd, &cchRemaining, dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = '\0'; - } - } - if (dwFlags & STRSAFE_NULL_ON_FAILURE) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = '\0'; } } + + if ((dwFlags & STRSAFE_NULL_ON_FAILURE) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCatExWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, @@ -2252,8 +2446,11 @@ NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { size_t cchDestLength; @@ -2261,37 +2458,39 @@ NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, { if (!pszDest) { - if ((cchDest==0) && (cbDest==0)) + if ((cchDest == 0) && (cbDest == 0)) cchDestLength = 0; else Status = STATUS_INVALID_PARAMETER; } else { - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + if (!pszSrc) pszSrc = L""; } else { - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { - if (*pszSrc!=L'\0') + if (*pszSrc != L'\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -2300,77 +2499,82 @@ NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, } } else - Status = RtlStringCopyExWorkerW(pszDestEnd,cchRemaining,(cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),pszSrc,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + { + Status = RtlStringCopyExWorkerW(pszDestEnd, cchRemaining, (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)), pszSrc, &pszDestEnd, &cchRemaining, dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } - } - if (dwFlags & STRSAFE_NULL_ON_FAILURE) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = L'\0'; } } + + if ((dwFlags & STRSAFE_NULL_ON_FAILURE) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCatNWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszSrc, size_t cchToAppend) { - NTSTATUS Status; size_t cchDestLength; - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + NTSTATUS Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) - Status = RtlStringCopyNWorkerA(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc,cchToAppend); + Status = RtlStringCopyNWorkerA(pszDest + cchDestLength, cchDest - cchDestLength, pszSrc, cchToAppend); + return Status; } -NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCatNWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszSrc, size_t cchToAppend) { - NTSTATUS Status; size_t cchDestLength; - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + NTSTATUS Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) - Status = RtlStringCopyNWorkerW(pszDest + cchDestLength,cchDest - cchDestLength,pszSrc,cchToAppend); + Status = RtlStringCopyNWorkerW(pszDest + cchDestLength, cchDest - cchDestLength, pszSrc, cchToAppend); + return Status; } -NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringCatNExWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCSTR pszSrc, @@ -2383,101 +2587,111 @@ NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest, STRSAFE_LPSTR pszDestEnd = pszDest; size_t cchRemaining = 0; size_t cchDestLength = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } + else if (cchToAppend > NTSTRSAFE_MAX_CCH) + { + Status = STATUS_INVALID_PARAMETER; + } else - if (cchToAppend > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) { - if (dwFlags & STRSAFE_IGNORE_NULLS) + if (!pszDest) { - if (!pszDest) - { - if ((cchDest==0) && (cbDest==0)) - cchDestLength = 0; - else - Status = STATUS_INVALID_PARAMETER; - } + if ((cchDest == 0) && (cbDest == 0)) + cchDestLength = 0; else - { - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); - if (NT_SUCCESS(Status)) - { - pszDestEnd = pszDest + cchDestLength; - cchRemaining = cchDest - cchDestLength; - } - } - if (!pszSrc) - pszSrc = ""; + Status = STATUS_INVALID_PARAMETER; } else { - Status = RtlStringLengthWorkerA(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + + if (!pszSrc) + pszSrc = ""; + } + else + { + Status = RtlStringLengthWorkerA(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { - if (cchDest==0) + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + + if (NT_SUCCESS(Status)) + { + if (cchDest == 0) + { + if ((cchToAppend != 0) && (*pszSrc != '\0')) { - if ((cchToAppend!=0) && (*pszSrc!='\0')) - { - if (!pszDest) - Status = STATUS_INVALID_PARAMETER; - else - Status = STATUS_BUFFER_OVERFLOW; - } + if (!pszDest) + Status = STATUS_INVALID_PARAMETER; + else + Status = STATUS_BUFFER_OVERFLOW; } - else - Status = RtlStringCopyNExWorkerA(pszDestEnd,cchRemaining,(cchRemaining*sizeof(char)) + (cbDest % sizeof(char)),pszSrc,cchToAppend,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + else + { + Status = RtlStringCopyNExWorkerA(pszDestEnd, cchRemaining, (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)), pszSrc, cchToAppend, &pszDestEnd, &cchRemaining, dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); } } + } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = '\0'; - } - } - if (dwFlags & (STRSAFE_NULL_ON_FAILURE)) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = '\0'; } } + + if ((dwFlags & STRSAFE_NULL_ON_FAILURE) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringCatNExWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPCWSTR pszSrc, @@ -2490,153 +2704,165 @@ NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest, STRSAFE_LPWSTR pszDestEnd = pszDest; size_t cchRemaining = 0; size_t cchDestLength = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } + else if (cchToAppend > NTSTRSAFE_MAX_CCH) + { + Status = STATUS_INVALID_PARAMETER; + } else - if (cchToAppend > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) { - if (dwFlags & STRSAFE_IGNORE_NULLS) + if (!pszDest) { - if (!pszDest) - { - if ((cchDest==0) && (cbDest==0)) - cchDestLength = 0; - else - Status = STATUS_INVALID_PARAMETER; - } + if ((cchDest == 0) && (cbDest == 0)) + cchDestLength = 0; else - { - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); - if (NT_SUCCESS(Status)) - { - pszDestEnd = pszDest + cchDestLength; - cchRemaining = cchDest - cchDestLength; - } - } - if (!pszSrc) - pszSrc = L""; + Status = STATUS_INVALID_PARAMETER; } else { - Status = RtlStringLengthWorkerW(pszDest,cchDest,&cchDestLength); + Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { pszDestEnd = pszDest + cchDestLength; cchRemaining = cchDest - cchDestLength; } } + + if (!pszSrc) + pszSrc = L""; + } + else + { + Status = RtlStringLengthWorkerW(pszDest, cchDest, &cchDestLength); if (NT_SUCCESS(Status)) { - if (cchDest==0) + pszDestEnd = pszDest + cchDestLength; + cchRemaining = cchDest - cchDestLength; + } + } + + if (NT_SUCCESS(Status)) + { + if (cchDest == 0) + { + if ((cchToAppend != 0) && (*pszSrc != L'\0')) { - if ((cchToAppend!=0) && (*pszSrc!=L'\0')) - { - if (!pszDest) - Status = STATUS_INVALID_PARAMETER; - else - Status = STATUS_BUFFER_OVERFLOW; - } + if (!pszDest) + Status = STATUS_INVALID_PARAMETER; + else + Status = STATUS_BUFFER_OVERFLOW; } - else - Status = RtlStringCopyNExWorkerW(pszDestEnd,cchRemaining,(cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)),pszSrc,cchToAppend,&pszDestEnd,&cchRemaining,dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + else + { + Status = RtlStringCopyNExWorkerW(pszDestEnd, cchRemaining, (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)), pszSrc, cchToAppend, &pszDestEnd, &cchRemaining, dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); } } + } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } - } - if (dwFlags & (STRSAFE_NULL_ON_FAILURE)) - { - if (cchDest > 0) + else if (cchDest > 0) { - pszDestEnd = pszDest; - cchRemaining = cchDest; + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; *pszDestEnd = L'\0'; } } + + if ((dwFlags & STRSAFE_NULL_ON_FAILURE) && cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringVPrintfWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, STRSAFE_LPCSTR pszFormat, va_list argList) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) + + if (cchDest == 0) + { Status = STATUS_INVALID_PARAMETER; + } else { - int iRet; - size_t cchMax; - cchMax = cchDest - 1; - iRet = _vsnprintf(pszDest,cchMax,pszFormat,argList); + size_t cchMax = cchDest - 1; + int iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t)iRet) > cchMax)) { pszDest += cchMax; *pszDest = '\0'; Status = STATUS_BUFFER_OVERFLOW; } - else - if (((size_t)iRet)==cchMax) - { - pszDest += cchMax; - *pszDest = '\0'; - } + else if (((size_t)iRet) == cchMax) + { + pszDest += cchMax; + *pszDest = '\0'; + } } + return Status; } -NTSTRSAFEAPI RtlpStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, - size_t cchDest, - STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, +NTSTRSAFEAPI RtlpStringVPrintfWorkerW( + STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, va_list argList) { NTSTATUS Status = STATUS_SUCCESS; - int iRet; - size_t cchMax; - cchMax = cchDest - 1; - iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); - if ((iRet < 0) || (((size_t) iRet) > cchMax)) + size_t cchMax = cchDest - 1; + int iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); + + if ((iRet < 0) || (((size_t)iRet) > cchMax)) { pszDest += cchMax; *pszDest = L'\0'; Status = STATUS_BUFFER_OVERFLOW; } - else - if (((size_t) iRet) == cchMax) - { - pszDest += cchMax; - *pszDest = L'\0'; - } + else if (((size_t)iRet) == cchMax) + { + pszDest += cchMax; + *pszDest = L'\0'; + } if (pcchDestNewLen) *pcchDestNewLen = (iRet == -1) ? cchDest : iRet; @@ -2644,30 +2870,33 @@ NTSTRSAFEAPI RtlpStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, return Status; } -NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, +NTSTRSAFEAPI RtlStringVPrintfWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, STRSAFE_LPCWSTR pszFormat, va_list argList) { - if (cchDest==0) + if (cchDest == 0) return STATUS_INVALID_PARAMETER; return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, NULL, argList); } -NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest, - size_t cchDest, - STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, +NTSTRSAFEAPI RtlStringVPrintfWorkerLenW( + STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, va_list argList) { if (cchDest == 0 || pcchDestNewLen == 0) return STATUS_INVALID_PARAMETER; - + return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, pcchDestNewLen, argList); } -NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, +NTSTRSAFEAPI RtlStringVPrintfExWorkerA( + STRSAFE_LPSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPSTR *ppszDestEnd, @@ -2679,27 +2908,32 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { if (dwFlags & STRSAFE_IGNORE_NULLS) { if (!pszDest) { - if ((cchDest!=0) || (cbDest!=0)) + if ((cchDest != 0) || (cbDest != 0)) Status = STATUS_INVALID_PARAMETER; } + if (!pszFormat) pszFormat = ""; } if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { pszDestEnd = pszDest; cchRemaining = 0; - if (*pszFormat!='\0') + + if (*pszFormat != '\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -2712,7 +2946,7 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, int iRet; size_t cchMax; cchMax = cchDest - 1; - iRet = _vsnprintf(pszDest,cchMax,pszFormat,argList); + iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList); if ((iRet < 0) || (((size_t)iRet) > cchMax)) { pszDestEnd = pszDest + cchMax; @@ -2720,46 +2954,46 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, *pszDestEnd = '\0'; Status = STATUS_BUFFER_OVERFLOW; } - else - if (((size_t)iRet)==cchMax) + else if (((size_t)iRet) == cchMax) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + else if (((size_t)iRet) < cchMax) + { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) { - pszDestEnd = pszDest + cchMax; - cchRemaining = 1; - *pszDestEnd = '\0'; + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); } - else - if (((size_t)iRet) < cchMax) - { - pszDestEnd = pszDest + iRet; - cchRemaining = cchDest - iRet; - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(char)) + (cbDest % sizeof(char))); - } - } + } } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = '\0'; - } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { if (cchDest > 0) @@ -2771,49 +3005,59 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlpStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, + +NTSTRSAFEAPI RtlpStringVPrintfExWorkerW( + STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, + size_t* pcchDestNewLen, va_list argList) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; size_t cchRemaining = 0; + if (dwFlags & (~STRSAFE_VALID_FLAGS)) + { Status = STATUS_INVALID_PARAMETER; + } else { if (dwFlags & STRSAFE_IGNORE_NULLS) { if (!pszDest) { - if ((cchDest!=0) || (cbDest!=0)) + if ((cchDest != 0) || (cbDest != 0)) Status = STATUS_INVALID_PARAMETER; } + if (!pszFormat) pszFormat = L""; } + if (NT_SUCCESS(Status)) { - if (cchDest==0) + if (cchDest == 0) { pszDestEnd = pszDest; cchRemaining = 0; - if (*pszFormat!=L'\0') + if (*pszFormat != L'\0') { if (!pszDest) Status = STATUS_INVALID_PARAMETER; @@ -2824,9 +3068,8 @@ NTSTRSAFEAPI RtlpStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, else { int iRet; - size_t cchMax; - cchMax = cchDest - 1; - iRet = _vsnwprintf(pszDest,cchMax,pszFormat,argList); + size_t cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); if ((iRet < 0) || (((size_t)iRet) > cchMax)) { pszDestEnd = pszDest + cchMax; @@ -2834,48 +3077,47 @@ NTSTRSAFEAPI RtlpStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, *pszDestEnd = L'\0'; Status = STATUS_BUFFER_OVERFLOW; } - else - if (((size_t)iRet)==cchMax) + else if (((size_t)iRet) == cchMax) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + else if (((size_t)iRet) < cchMax) + { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) { - pszDestEnd = pszDest + cchMax; - cchRemaining = 1; - *pszDestEnd = L'\0'; + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); } - else - if (((size_t)iRet) < cchMax) - { - pszDestEnd = pszDest + iRet; - cchRemaining = cchDest - iRet; - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); - } - } + } if (pcchDestNewLen) *pcchDestNewLen = iRet == -1 ? cchDest : iRet; } } } + if (!NT_SUCCESS(Status)) { if (pszDest) { if (dwFlags & STRSAFE_FILL_ON_FAILURE) { - memset(pszDest,STRSAFE_GET_FILL_PATTERN(dwFlags),cbDest); - if (STRSAFE_GET_FILL_PATTERN(dwFlags)==0) + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) { pszDestEnd = pszDest; cchRemaining = cchDest; } - else - if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - *pszDestEnd = L'\0'; - } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } } if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) { @@ -2888,36 +3130,41 @@ NTSTRSAFEAPI RtlpStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, } } } - if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) + + if (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW)) { if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; } + return Status; } -NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, - size_t cchDest, - size_t cbDest, - STRSAFE_LPWSTR *ppszDestEnd, - size_t *pcchRemaining, - STRSAFE_DWORD dwFlags, - STRSAFE_LPCWSTR pszFormat, +NTSTRSAFEAPI RtlStringVPrintfExWorkerW( + STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, va_list argList) { return RtlpStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, NULL, argList); } -NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, - size_t cchDest, - size_t cbDest, - STRSAFE_LPWSTR *ppszDestEnd, - size_t *pcchRemaining, - STRSAFE_DWORD dwFlags, - STRSAFE_LPCWSTR pszFormat, - size_t* pcchDestNewLen, +NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW( + STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, va_list argList) { if (pcchDestNewLen == 0) @@ -2929,19 +3176,22 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, NTSTRSAFEAPI RtlStringLengthWorkerA( - _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, - _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength) + _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, + _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength) { NTSTATUS Status = STATUS_SUCCESS; size_t cchMaxPrev = cchMax; - while(cchMax && (*psz!='\0')) + + while (cchMax && (*psz != '\0')) { psz++; cchMax--; } - if (cchMax==0) + + if (cchMax == 0) Status = STATUS_INVALID_PARAMETER; + if (pcchLength) { if (NT_SUCCESS(Status)) @@ -2949,24 +3199,28 @@ RtlStringLengthWorkerA( else *pcchLength = 0; } + return Status; } NTSTRSAFEAPI RtlStringLengthWorkerW( - _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, - _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, - _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength) + _In_reads_or_z_(cchMax) STRSAFE_LPCWSTR psz, + _In_ _In_range_(<=, NTSTRSAFE_MAX_CCH) size_t cchMax, + _Out_opt_ _Deref_out_range_(<, cchMax) size_t *pcchLength) { NTSTATUS Status = STATUS_SUCCESS; size_t cchMaxPrev = cchMax; - while(cchMax && (*psz!=L'\0')) + + while (cchMax && (*psz != L'\0')) { psz++; cchMax--; } - if (cchMax==0) + + if (cchMax == 0) Status = STATUS_INVALID_PARAMETER; + if (pcchLength) { if (NT_SUCCESS(Status)) @@ -2974,11 +3228,13 @@ RtlStringLengthWorkerW( else *pcchLength = 0; } + return Status; } NTSTRSAFEAPI -RtlpUnicodeStringValidate(_In_opt_ PCUNICODE_STRING SourceString, +RtlpUnicodeStringValidate( + _In_opt_ PCUNICODE_STRING SourceString, _In_ STRSAFE_DWORD dwFlags) { if (SourceString) @@ -3008,7 +3264,8 @@ RtlUnicodeStringValidate(_In_opt_ PCUNICODE_STRING SourceString) } NTSTRSAFEAPI -RtlUnicodeStringValidateEx(_In_opt_ PCUNICODE_STRING SourceString, +RtlUnicodeStringValidateEx( + _In_opt_ PCUNICODE_STRING SourceString, _In_ STRSAFE_DWORD dwFlags) { if (dwFlags & ~(STRSAFE_UNICODE_STRING_VALID_FLAGS)) @@ -3017,11 +3274,13 @@ RtlUnicodeStringValidateEx(_In_opt_ PCUNICODE_STRING SourceString, return RtlpUnicodeStringValidate(SourceString, dwFlags); } -static +static NTSTATUS __cdecl -RtlUnicodeStringPrintf(_In_ PUNICODE_STRING DestinationString, - _In_ NTSTRSAFE_PCWSTR pszFormat, ...) +RtlUnicodeStringPrintf( + _In_ PUNICODE_STRING DestinationString, + _In_ NTSTRSAFE_PCWSTR pszFormat, + ...) { NTSTATUS Status; size_t cchFinalLength; @@ -3056,18 +3315,19 @@ RtlUnicodeStringPrintf(_In_ PUNICODE_STRING DestinationString, return Status; } -static +static NTSTATUS __cdecl -RtlUnicodeStringPrintfEx(_In_opt_ PUNICODE_STRING DestinationString, +RtlUnicodeStringPrintfEx( + _In_opt_ PUNICODE_STRING DestinationString, _In_opt_ PUNICODE_STRING RemainingString, _In_ STRSAFE_DWORD dwFlags, _In_ NTSTRSAFE_PCWSTR pszFormat, ...) { - NTSTATUS Status; - size_t cchFinalLength; - size_t cchRemaining; - va_list argList; + NTSTATUS Status; + size_t cchFinalLength; + size_t cchRemaining; + va_list argList; va_start(argList, pszFormat);

1 0

[reactos] 01/04: [DDK] RtlUnicodeStringPrintf(Ex) implementations and ntstrsafe.h tests (#522, #523)
by Hernán Di Pietro 28 Aug '19

28 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99818568ed15b61a6d6de… commit 99818568ed15b61a6d6de92a04c79458974f341a Author: Hernán Di Pietro <indiocolifa(a)hotmail.com> AuthorDate: Sat Apr 21 08:56:12 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Aug 28 22:28:13 2019 +0200 [DDK] RtlUnicodeStringPrintf(Ex) implementations and ntstrsafe.h tests (#522, #523) [KMTESTS:RTL] (CORE-14565) + Added buffer overrun tests. + New style header. + ISO C90 compatibility [DDK] (CORE-9819): RtlUnicodeStringPrintf(Ex) and RtlUnicodeStringValidate(Ex) fixes plus formatting. [DDK]: Cosmetic changes (NTSTATUS variable naming and tabs) [DDK] First implementation of Unicode functions for NtStrSafe (CORE-9819) + This implementation does not modify the interface of previous functions. + Since we need length returned for the destination UNICODE_STRING.Length field: - an intermediate "Len" postfixed function was added with optional argument to return the _vsnwprintf character count. - Wide Printf(Ex) functions already existent work now call new Rtlp private worker functions. + For several UnicodeStringPrintf(Ex) tests, see work going on CORE-14565 NOTES: + MSDN says they won't insert NULL characters on formatted strings. But seems this is incorrect at MSDN (interpret this as DONT ASSUME NULL-termination). We return zero-terminated strings, and MS functions seems to do the same. (XP DDK 7.1) [DDK] First implementation of Unicode functions for NtStrSafe (CORE-9819) + This implementation does not modify the interface of previous functions. + Since we need length returned for the destination UNICODE_STRING.Length field: - an intermediate "Len" postfixed function was added with optional argument to return the _vsnwprintf character count. - Wide Printf(Ex) functions already existent work now call new Rtlp private worker functions. + For several UnicodeStringPrintf(Ex) tests, see work going on CORE-14565 NOTES: + MSDN says they won't insert NULL characters on formatted strings. But seems this is incorrect at MSDN (interpret this as DONT ASSUME NULL-termination). We return zero-terminated strings, and MS functions seems to do the same. (XP DDK 7.1) [DDK] Fixed bad NtStrSafe.h va_start call (CORE-9819) Update on RtlUnicodeStringPrintfEx plus cosmetic changes. [DDK] First implementation of Unicode functions for NtStrSafe (CORE-9819) + This implementation does not modify the interface of previous functions. + Since we need length returned for the destination UNICODE_STRING.Length field: - an intermediate "Len" postfixed function was added with optional argument to return the _vsnwprintf character count. - Wide Printf(Ex) functions already existent work now call new Rtlp private worker functions. + For several UnicodeStringPrintf(Ex) tests, see work going on CORE-14565 NOTES: + MSDN says they won't insert NULL characters on formatted strings. But seems this is incorrect at MSDN (interpret this as DONT ASSUME NULL-termination). We return zero-terminated strings, and MS functions seems to do the same. (XP DDK 7.1) [KMTESTS:RTL] Tests for new RtlUnicodePrintf(Ex) functions (CORE-14565) + 45 Tests working. + Lacks remaining non-Unicode functions in NtStrSafe.h for now. + Used for first tests on CORE-9819 [KMTESTS/RTL] Fixed test not taking care of null (CORE-14565) [DDK] Fixed bad NtStrSafe.h va_start call (CORE-9819) [KMTESTS:RTL] First Test. Update on RtlUnicodeStringPrintfEx plus cosmetic changes. [KMTESTS] Added NtStrSafe to test lists (CORE-14565) First commit: Skeleton for test implementation + Addition to COMMON SOURCES in kmtests Cmake lists. WIP. +Implementation of RtlStringVPrintfWorkerLenW, RtlStringVPrintfExWorkerLenW to avoid changing existing public functions. This is required as existent functions did not return vsnprintf result, so we didn't have any return info to update UNICODE_STRING.Length. +Additional implementation of RtlUnicodeStringValidate for checking purposes. +Former RtlStringVPrintfWorker(ex) refactored to RtlInternalStringVPrintf(Ex)WorkerW. +No ANSI functions affected as we didn't need them for Unicode printf's. WIP: RtlUnicodeStringPrintf --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest/testlist.c | 2 + modules/rostests/kmtests/kmtest_drv/testlist.c | 2 + modules/rostests/kmtests/rtl/RtlStrSafe.c | 179 +++++++++++++ sdk/include/ddk/ntstrsafe.h | 346 ++++++++++++++++++++++--- 5 files changed, 493 insertions(+), 37 deletions(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index b7cf7093ad0..087bb31c704 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND COMMON_SOURCE rtl/RtlRegistry.c rtl/RtlSplayTree.c rtl/RtlStack.c + rtl/RtlStrSafe.c rtl/RtlUnicodeString.c) # diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 5375d04cdec..b71d1ba2e2c 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -31,6 +31,7 @@ KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlStack; +KMT_TESTFUNC Test_RtlStrSafe; KMT_TESTFUNC Test_RtlUnicodeString; KMT_TESTFUNC Test_TcpIpIoctl; KMT_TESTFUNC Test_TcpIpTdi; @@ -64,6 +65,7 @@ const KMT_TEST TestList[] = { "RtlRegistry", Test_RtlRegistry }, { "RtlSplayTree", Test_RtlSplayTree }, { "RtlStack", Test_RtlStack }, + { "RtlStrSafe", Test_RtlStrSafe }, { "RtlUnicodeString", Test_RtlUnicodeString }, { "TcpIpTdi", Test_TcpIpTdi }, { "TcpIpConnect", Test_TcpIpConnect }, diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 3dc3a6d0fc6..8bdd245b79a 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -72,6 +72,7 @@ KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlStack; +KMT_TESTFUNC Test_RtlStrSafe; KMT_TESTFUNC Test_RtlUnicodeString; KMT_TESTFUNC Test_ZwAllocateVirtualMemory; KMT_TESTFUNC Test_ZwCreateSection; @@ -144,6 +145,7 @@ const KMT_TEST TestList[] = { "RtlRegistryKM", Test_RtlRegistry }, { "RtlSplayTreeKM", Test_RtlSplayTree }, { "RtlStackKM", Test_RtlStack }, + { "RtlStrSafeKM", Test_RtlStrSafe }, { "RtlUnicodeStringKM", Test_RtlUnicodeString }, { "SeInheritance", Test_SeInheritance }, { "SeQueryInfoToken", Test_SeQueryInfoToken }, diff --git a/modules/rostests/kmtests/rtl/RtlStrSafe.c b/modules/rostests/kmtests/rtl/RtlStrSafe.c new file mode 100644 index 00000000000..807a036b2a7 --- /dev/null +++ b/modules/rostests/kmtests/rtl/RtlStrSafe.c @@ -0,0 +1,179 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for ntstrsafe.h functions + * COPYRIGHT: Copyright 2018 Hern�n Di Pietro <hernan.di.pietro(a)gmail.com> + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> +#include <ntstrsafe.h> +#include <ntdef.h> +#include <ndk/rtlfuncs.h> + +#define TESTAPI static void + +TESTAPI +Test_RtlUnicodeStringPrintf() +{ + WCHAR Buffer[1024]; + WCHAR OvrBuffer[1024]; + WCHAR BufferSmall[2]; + WCHAR BufferSmall2[7]; + UNICODE_STRING UsString; + const WCHAR FormatStringInts[] = L"%d %d %d"; + const WCHAR FormatStringStrs[] = L"%s %s %s"; + const WCHAR Result[] = L"1 2 3"; + UNICODE_STRING UsStringNull; + + /* No zeros (Don't assume UNICODE_STRINGS are NULL terminated) */ + + RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); + RtlFillMemory(BufferSmall, sizeof(BufferSmall), 0xAA); + RtlFillMemory(BufferSmall2, sizeof(BufferSmall2), 0xAA); + + /* STATUS_SUCCESS test */ + + UsString.Buffer = Buffer; + UsString.Length = 0; + UsString.MaximumLength = sizeof(Buffer); + + ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringInts, 1, 2, 3), STATUS_SUCCESS); + ok_eq_uint(UsString.Length, sizeof(Result) - sizeof(WCHAR)); + ok_eq_uint(UsString.MaximumLength, sizeof(Buffer)); + ok_eq_wchar(UsString.Buffer[0], L'1'); + ok_eq_wchar(UsString.Buffer[1], L' '); + ok_eq_wchar(UsString.Buffer[2], L'2'); + ok_eq_wchar(UsString.Buffer[3], L' '); + ok_eq_wchar(UsString.Buffer[4], L'3'); + ok_eq_wchar(UsString.Buffer[5], (WCHAR) 0); + + /* STATUS_BUFFER_OVERFLOW tests */ + + UsString.Buffer = BufferSmall; + UsString.Length = 0; + UsString.MaximumLength = sizeof(BufferSmall); + + ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_BUFFER_OVERFLOW); + ok_eq_uint(UsString.Length, UsString.MaximumLength); + ok_eq_char(UsString.Buffer[0], L'A'); + ok_eq_char(UsString.Buffer[1], (WCHAR)0); + + UsString.Buffer = BufferSmall2; + UsString.Length = 0; + UsString.MaximumLength = sizeof(BufferSmall2); + + ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"0123", L"4567", L"89AB"), STATUS_BUFFER_OVERFLOW); + ok_eq_uint(UsString.Length, UsString.MaximumLength); + ok_eq_char(UsString.Buffer[0], L'0'); + ok_eq_char(UsString.Buffer[1], L'1'); + ok_eq_char(UsString.Buffer[2], L'2'); + ok_eq_char(UsString.Buffer[3], L'3'); + ok_eq_char(UsString.Buffer[4], L' '); + ok_eq_char(UsString.Buffer[5], L'4'); + ok_eq_char(UsString.Buffer[6], (WCHAR) 0); + + ///* STATUS_INVALID_PARAMETER tests */ + + ok_eq_hex(RtlUnicodeStringPrintf(NULL, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); + ok_eq_hex(RtlUnicodeStringPrintf(&UsString, NULL, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); + + UsStringNull.Buffer = (PWCH)NULL; + UsStringNull.Length = 0; + UsStringNull.MaximumLength = 0; + ok_eq_bool(RtlUnicodeStringPrintf(&UsStringNull, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_INVALID_PARAMETER); + + /* Test for buffer overruns */ + + RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); + RtlFillMemory(OvrBuffer, sizeof(OvrBuffer), 0xAA); + UsString.Buffer = Buffer; + UsString.Length = 0; + UsString.MaximumLength = 16 * sizeof(WCHAR); + + ok_eq_hex(RtlUnicodeStringPrintf(&UsString, FormatStringStrs, L"abc", L"def", L"ghi"), STATUS_SUCCESS); + ok_eq_uint(UsString.Length, sizeof(L"abc def ghi") -sizeof(WCHAR)); + ok_eq_char(UsString.Buffer[11], (WCHAR)0); + ok_eq_uint(0, memcmp(OvrBuffer + 12, Buffer + 12, sizeof(Buffer) - (12 * sizeof(WCHAR)))); +} + +TESTAPI +Test_RtlUnicodeStringPrintfEx() +{ + WCHAR Buffer[32]; + WCHAR BufferSmall[8] = { 0 }; + WCHAR OvrBuffer[1024]; + UNICODE_STRING UsString, RemString; + const WCHAR FormatStringInts[] = L"%d %d %d"; + const WCHAR FormatStringStrs[] = L"%s %s %s"; + const WCHAR Result[] = L"1 2 3"; + + /* No zeros (Don't assume UNICODE_STRINGS are NULL terminated) */ + + RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); + + UsString.Buffer = Buffer; + UsString.Length = 0; + UsString.MaximumLength = sizeof(Buffer); + + RemString.Buffer = (PWCH)NULL; + RemString.Length = 0; + RemString.MaximumLength = 0; + + /* STATUS_SUCCESS test, fill behind flag: low-byte as fill character */ + + ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, STRSAFE_FILL_BEHIND | 0xFF, FormatStringInts, 1, 2, 3), STATUS_SUCCESS); + + ok_eq_uint(UsString.Length, sizeof(Result) - sizeof(WCHAR)); + ok_eq_uint(UsString.MaximumLength, sizeof(Buffer)); + ok_eq_uint(memcmp(UsString.Buffer, Result, sizeof(Result) - sizeof(WCHAR)), 0); + + ok_eq_pointer(RemString.Buffer, UsString.Buffer + (UsString.Length / sizeof(WCHAR))); + ok_eq_uint(RemString.Length, 0); + ok_eq_uint(RemString.MaximumLength, UsString.MaximumLength - UsString.Length); + + /* STATUS_BUFFER_OVERFLOW test */ + + UsString.Buffer = BufferSmall; + UsString.Length = 0; + UsString.MaximumLength = sizeof(BufferSmall); + + RemString.Buffer = (PWCH)NULL; + RemString.Length = 0; + RemString.MaximumLength = 0; + + ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, 0, FormatStringStrs, L"AAA", L"BBB", L"CCC"), STATUS_BUFFER_OVERFLOW); + ok_eq_uint(UsString.Length, UsString.MaximumLength); + ok_eq_char(UsString.Buffer[0], L'A'); + ok_eq_char(UsString.Buffer[1], L'A'); + ok_eq_char(UsString.Buffer[2], L'A'); + ok_eq_char(UsString.Buffer[3], L' '); + ok_eq_char(UsString.Buffer[4], L'B'); + ok_eq_char(UsString.Buffer[5], L'B'); + ok_eq_char(UsString.Buffer[6], L'B'); + ok_eq_char(UsString.Buffer[7], (WCHAR)0); + + // Takes \0 into account + ok_eq_pointer(RemString.Buffer, UsString.Buffer + (UsString.Length - 1) / sizeof(WCHAR)); + ok_eq_uint(RemString.Length, 0); + ok_eq_uint(RemString.MaximumLength, 2); + + /* Test for buffer overruns */ + + RtlFillMemory(Buffer, sizeof(Buffer), 0xAA); + RtlFillMemory(OvrBuffer, sizeof(OvrBuffer), 0xAA); + UsString.Buffer = Buffer; + UsString.Length = 0; + UsString.MaximumLength = 16 * sizeof(WCHAR); + + ok_eq_hex(RtlUnicodeStringPrintfEx(&UsString, &RemString, 0, FormatStringStrs, L"abc", L"def", L"ghi"), STATUS_SUCCESS); + ok_eq_uint(UsString.Length, sizeof(L"abc def ghi") - sizeof(WCHAR)); + ok_eq_char(UsString.Buffer[11], (WCHAR)0); + ok_eq_uint(0, memcmp(OvrBuffer + 12, Buffer + 12, sizeof(Buffer) - (12 * sizeof(WCHAR)))); +} + +START_TEST(RtlStrSafe) +{ + Test_RtlUnicodeStringPrintf(); + Test_RtlUnicodeStringPrintfEx(); +} diff --git a/sdk/include/ddk/ntstrsafe.h b/sdk/include/ddk/ntstrsafe.h index 502096b135c..de2a4921f1f 100644 --- a/sdk/include/ddk/ntstrsafe.h +++ b/sdk/include/ddk/ntstrsafe.h @@ -58,6 +58,9 @@ #define STRSAFE_GET_FILL_PATTERN(dwFlags) ((int)((dwFlags) & 0x000000FF)) #endif +#define STRSAFE_FILL_BEHIND STRSAFE_FILL_BEHIND_NULL +#define STRSAFE_ZERO_LENGTH_ON_FAILURE STRSAFE_NULL_ON_FAILURE + typedef char *STRSAFE_LPSTR; typedef const char *STRSAFE_LPCSTR; typedef wchar_t *STRSAFE_LPWSTR; @@ -88,8 +91,11 @@ NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags); NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszFormat,va_list argList); NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,va_list argList); +NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,size_t* pcchDestNewLen, va_list argList); NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCSTR pszFormat,va_list argList); NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCWSTR pszFormat,va_list argList); +NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, size_t cchDest, size_t cbDest, STRSAFE_LPWSTR *ppszDestEnd, size_t *pcchRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCWSTR pszFormat, size_t* pcchDestNewLen, va_list argList); +NTSTRSAFEAPI RtlUnicodeStringValidate(PCUNICODE_STRING SourceString); NTSTRSAFEAPI RtlStringLengthWorkerA( @@ -1575,7 +1581,9 @@ RtlStringCbLengthW( return Status; } -NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc) +NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + STRSAFE_LPCSTR pszSrc) { NTSTATUS Status = STATUS_SUCCESS; if (cchDest==0) @@ -1597,7 +1605,9 @@ NTSTRSAFEAPI RtlStringCopyWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_L return Status; } -NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc) +NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszSrc) { NTSTATUS Status = STATUS_SUCCESS; if (cchDest==0) @@ -1619,7 +1629,13 @@ NTSTRSAFEAPI RtlStringCopyWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_ return Status; } -NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; @@ -1719,7 +1735,13 @@ NTSTRSAFEAPI RtlStringCopyExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; @@ -1819,7 +1841,9 @@ NTSTRSAFEAPI RtlStringCopyExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchSrc) +NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + STRSAFE_LPCSTR pszSrc,size_t cchSrc) { NTSTATUS Status = STATUS_SUCCESS; if (cchDest==0) @@ -1842,7 +1866,10 @@ NTSTRSAFEAPI RtlStringCopyNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_ return Status; } -NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy) +NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszSrc, + size_t cchToCopy) { NTSTATUS Status = STATUS_SUCCESS; if (cchDest==0) @@ -1865,7 +1892,14 @@ NTSTRSAFEAPI RtlStringCopyNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE return Status; } -NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cchToCopy,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cchToCopy, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; @@ -1969,7 +2003,14 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cchToCopy, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; @@ -2073,7 +2114,9 @@ NTSTRSAFEAPI RtlStringCopyNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_ return Status; } -NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc) +NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + STRSAFE_LPCSTR pszSrc) { NTSTATUS Status; size_t cchDestLength; @@ -2083,7 +2126,9 @@ NTSTRSAFEAPI RtlStringCatWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LP return Status; } -NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc) +NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszSrc) { NTSTATUS Status; size_t cchDestLength; @@ -2093,7 +2138,13 @@ NTSTRSAFEAPI RtlStringCatWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_L return Status; } -NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; @@ -2190,7 +2241,13 @@ NTSTRSAFEAPI RtlStringCatExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t c return Status; } -NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; @@ -2287,7 +2344,10 @@ NTSTRSAFEAPI RtlStringCatExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend) +NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + STRSAFE_LPCSTR pszSrc, + size_t cchToAppend) { NTSTATUS Status; size_t cchDestLength; @@ -2297,7 +2357,10 @@ NTSTRSAFEAPI RtlStringCatNWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_L return Status; } -NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend) +NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszSrc, + size_t cchToAppend) { NTSTATUS Status; size_t cchDestLength; @@ -2307,7 +2370,14 @@ NTSTRSAFEAPI RtlStringCatNWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_ return Status; } -NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cchToAppend, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; @@ -2407,7 +2477,14 @@ NTSTRSAFEAPI RtlStringCatNExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags) +NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cchToAppend, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; @@ -2507,7 +2584,10 @@ NTSTRSAFEAPI RtlStringCatNExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t return Status; } -NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszFormat,va_list argList) +NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + STRSAFE_LPCSTR pszFormat, + va_list argList) { NTSTATUS Status = STATUS_SUCCESS; if (cchDest==0) @@ -2534,34 +2614,67 @@ NTSTRSAFEAPI RtlStringVPrintfWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAF return Status; } -NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,va_list argList) +NTSTRSAFEAPI RtlpStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, + va_list argList) { NTSTATUS Status = STATUS_SUCCESS; - if (cchDest==0) - Status = STATUS_INVALID_PARAMETER; - else + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t) iRet) > cchMax)) { - int iRet; - size_t cchMax; - cchMax = cchDest - 1; - iRet = _vsnwprintf(pszDest,cchMax,pszFormat,argList); - if ((iRet < 0) || (((size_t)iRet) > cchMax)) + pszDest += cchMax; + *pszDest = L'\0'; + Status = STATUS_BUFFER_OVERFLOW; + } + else + if (((size_t) iRet) == cchMax) { pszDest += cchMax; *pszDest = L'\0'; - Status = STATUS_BUFFER_OVERFLOW; } - else - if (((size_t)iRet)==cchMax) - { - pszDest += cchMax; - *pszDest = L'\0'; - } - } + + if (pcchDestNewLen) + *pcchDestNewLen = (iRet == -1) ? cchDest : iRet; + return Status; } -NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCSTR pszFormat,va_list argList) +NTSTRSAFEAPI RtlStringVPrintfWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + va_list argList) +{ + if (cchDest==0) + return STATUS_INVALID_PARAMETER; + + return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, NULL, argList); +} + +NTSTRSAFEAPI RtlStringVPrintfWorkerLenW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, + va_list argList) +{ + if (cchDest == 0 || pcchDestNewLen == 0) + return STATUS_INVALID_PARAMETER; + + return RtlpStringVPrintfWorkerW(pszDest, cchDest, pszFormat, pcchDestNewLen, argList); +} + +NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCSTR pszFormat, + va_list argList) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPSTR pszDestEnd = pszDest; @@ -2667,8 +2780,15 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerA(STRSAFE_LPSTR pszDest,size_t cchDest,size } return Status; } - -NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,size_t cbDest,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,STRSAFE_DWORD dwFlags,STRSAFE_LPCWSTR pszFormat,va_list argList) +NTSTRSAFEAPI RtlpStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, + va_list argList) { NTSTATUS Status = STATUS_SUCCESS; STRSAFE_LPWSTR pszDestEnd = pszDest; @@ -2731,6 +2851,9 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,siz memset(pszDestEnd + 1,STRSAFE_GET_FILL_PATTERN(dwFlags),((cchRemaining - 1)*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); } } + + if (pcchDestNewLen) + *pcchDestNewLen = iRet == -1 ? cchDest : iRet; } } } @@ -2775,6 +2898,35 @@ NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest,size_t cchDest,siz return Status; } +NTSTRSAFEAPI RtlStringVPrintfExWorkerW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + va_list argList) +{ + return RtlpStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, NULL, argList); +} + +NTSTRSAFEAPI RtlStringVPrintfExWorkerLenW(STRSAFE_LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + size_t* pcchDestNewLen, + va_list argList) +{ + if (pcchDestNewLen == 0) + return STATUS_INVALID_PARAMETER; + + return RtlpStringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, pcchDestNewLen, argList); +} + + NTSTRSAFEAPI RtlStringLengthWorkerA( _In_reads_or_z_(cchMax) STRSAFE_LPCSTR psz, @@ -2825,6 +2977,126 @@ RtlStringLengthWorkerW( return Status; } +NTSTRSAFEAPI +RtlpUnicodeStringValidate(_In_opt_ PCUNICODE_STRING SourceString, + _In_ STRSAFE_DWORD dwFlags) +{ + if (SourceString) + { + if (SourceString->Length % sizeof(WCHAR) != 0 || + SourceString->MaximumLength % sizeof(WCHAR) != 0 || + SourceString->Length > SourceString->MaximumLength || + SourceString->MaximumLength > NTSTRSAFE_UNICODE_STRING_MAX_CCH * sizeof(WCHAR) || + (SourceString->Buffer == NULL && (SourceString->Length != 0 || SourceString->MaximumLength != 0))) + { + return STATUS_INVALID_PARAMETER; + } + } + else + { + if (!(dwFlags & STRSAFE_IGNORE_NULLS)) + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + +NTSTRSAFEAPI +RtlUnicodeStringValidate(_In_opt_ PCUNICODE_STRING SourceString) +{ + return RtlpUnicodeStringValidate(SourceString, 0); +} + +NTSTRSAFEAPI +RtlUnicodeStringValidateEx(_In_opt_ PCUNICODE_STRING SourceString, + _In_ STRSAFE_DWORD dwFlags) +{ + if (dwFlags & ~(STRSAFE_UNICODE_STRING_VALID_FLAGS)) + return STATUS_INVALID_PARAMETER; + + return RtlpUnicodeStringValidate(SourceString, dwFlags); +} + +static +NTSTATUS +__cdecl +RtlUnicodeStringPrintf(_In_ PUNICODE_STRING DestinationString, + _In_ NTSTRSAFE_PCWSTR pszFormat, ...) +{ + NTSTATUS Status; + size_t cchFinalLength; + va_list argList; + + if (DestinationString == NULL || pszFormat == NULL || DestinationString->Buffer == NULL) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = RtlUnicodeStringValidate(DestinationString); + if (NT_SUCCESS(Status)) + { + va_start(argList, pszFormat); + + Status = RtlStringVPrintfWorkerLenW(DestinationString->Buffer, + DestinationString->MaximumLength / sizeof(WCHAR), + pszFormat, + &cchFinalLength, + argList); + + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) + { + DestinationString->Length = (USHORT)(cchFinalLength * sizeof(WCHAR)); + } + + va_end(argList); + } + } + + return Status; +} + +static +NTSTATUS +__cdecl +RtlUnicodeStringPrintfEx(_In_opt_ PUNICODE_STRING DestinationString, + _In_opt_ PUNICODE_STRING RemainingString, + _In_ STRSAFE_DWORD dwFlags, + _In_ NTSTRSAFE_PCWSTR pszFormat, ...) +{ + NTSTATUS Status; + size_t cchFinalLength; + size_t cchRemaining; + va_list argList; + + va_start(argList, pszFormat); + + Status = RtlStringVPrintfExWorkerLenW(DestinationString->Buffer, + DestinationString->MaximumLength / sizeof(WCHAR), + DestinationString->MaximumLength, + &RemainingString->Buffer, + &cchRemaining, + dwFlags, + pszFormat, + &cchFinalLength, + argList); + + va_end(argList); + + if (Status == STATUS_BUFFER_OVERFLOW || NT_SUCCESS(Status)) + { + DestinationString->Length = (USHORT)(cchFinalLength * sizeof(WCHAR)); + + if (RemainingString) + { + RemainingString->Length = 0; + RemainingString->MaximumLength = (USHORT)cchRemaining * sizeof(WCHAR); + } + } + + return Status; +} + #define RtlStringCopyWorkerA RtlStringCopyWorkerA_instead_use_StringCchCopyA_or_StringCchCopyExA; #define RtlStringCopyWorkerW RtlStringCopyWorkerW_instead_use_StringCchCopyW_or_StringCchCopyExW; #define RtlStringCopyExWorkerA RtlStringCopyExWorkerA_instead_use_StringCchCopyA_or_StringCchCopyExA;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs