Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 17:56:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[APITESTS] Use StringCbPrintfA instead of sprintf

Browse source 
And fix a buffer size in Test_AddFontResourceA
This commit is contained in:
Victor Perevertkin 2019-08-17 23:04:41 +03:00
parent f7dc14cca5
commit 6b10706205
8 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c
View file

@ -25,6 +25,7 @@
#include <winreg.h>
#include <winsvc.h>
#include <setupapi.h>
#include <strsafe.h>
static const char inffile[] = "test.inf";
static char CURR_DIR[MAX_PATH];
@ -56,7 +57,7 @@ static void test_SetupDiInstallClassExA(void)
/* [Version]:Signature */
strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -68,7 +69,7 @@ static void test_SetupDiInstallClassExA(void)
/* [Version]:Signature+Class */
strcat(inf, "Class=MySampleClass\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -80,7 +81,7 @@ static void test_SetupDiInstallClassExA(void)
/* [Version]:Signature+Class+ClassGUID */
strcat(inf, "ClassGuid={3b409830-5f9d-432a-abf5-7d2e4e102467}\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -92,7 +93,7 @@ static void test_SetupDiInstallClassExA(void)
/* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]Empty */
strcat(inf, "[ClassInstall32.NT]\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -104,13 +105,13 @@ static void test_SetupDiInstallClassExA(void)
{
RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle);
del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}");
ok(del == ERROR_SUCCESS, "Expected success \n");
ok(del == ERROR_SUCCESS, "Expected success \n");
}
/* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg */
strcat(inf, "AddReg=SampleClassAddReg\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -122,13 +123,13 @@ static void test_SetupDiInstallClassExA(void)
{
RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle);
del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}");
ok(del == ERROR_SUCCESS, "Expected success \n");
ok(del == ERROR_SUCCESS, "Expected success \n");
}
/* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg];*/
strcat(inf, "[SampleClassAddReg]\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -140,13 +141,13 @@ static void test_SetupDiInstallClassExA(void)
{
RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle);
del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}");
ok(del == ERROR_SUCCESS, "Expected success \n");
ok(del == ERROR_SUCCESS, "Expected success \n");
}
/* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg]HKR;*/
strcat(inf, "HKR,,,,\"ReactOS Test SetupDiInstallClassExA\"\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -158,13 +159,13 @@ static void test_SetupDiInstallClassExA(void)
{
RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle);
del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}");
ok(del == ERROR_SUCCESS, "Expected success \n");
ok(del == ERROR_SUCCESS, "Expected success \n");
}
/*[Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg;[SampleClassAddReg]HKR;[ClassInstall32.NT.Services]*/
strcat(inf, "[ClassInstall32.NT.Services]\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
SetLastError(0xdeadbeef);
ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL);
@ -176,7 +177,7 @@ static void test_SetupDiInstallClassExA(void)
{
RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle);
del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}");
ok(del == ERROR_SUCCESS, "Expected success\n");
ok(del == ERROR_SUCCESS, "Expected success\n");
}
/* Add a reference */

11
modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c
View file

@ -25,6 +25,7 @@
#include <winreg.h>
#include <winsvc.h>
#include <setupapi.h>
#include <strsafe.h>
static const char inffile[] = "test.inf";
static char CURR_DIR[MAX_PATH];
@ -72,7 +73,7 @@ static void test_SetupInstallServicesFromInfSectionExA(void)
/* Basic inf file to satisfy SetupOpenInfFileA */
strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
/* Nothing but the Version section */
@ -193,7 +194,7 @@ static void test_SetupInstallServicesFromInfSectionExA(void)
strcat(inf, "[XSP.InstallPerVer]\n");
strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
SetLastError(0xdeadbeef);
@ -227,7 +228,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void)
/* Basic inf file to satisfy SetupOpenInfFileA */
strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
/* Nothing but the Version section */
@ -348,7 +349,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void)
strcat(inf, "[XSP.InstallPerVer]\n");
strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n");
create_inf_file(inffile, inf);
sprintf(path, "%s\\%s", CURR_DIR, inffile);
StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile);
infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
SetLastError(0xdeadbeef);
@ -364,7 +365,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void)
START_TEST(SetupInstallServicesFromInfSectionEx)
{
char temp_path[MAX_PATH], prev_path[MAX_PATH];
char temp_path[MAX_PATH], prev_path[MAX_PATH];
GetCurrentDirectoryA(MAX_PATH, prev_path);
GetTempPathA(MAX_PATH, temp_path);