version/tests: Write-strings warnings fix.
This commit is contained in:
parent
c50fe56096
commit
b40f4c0b17
@ -176,6 +176,7 @@ static void test_info(void)
|
|||||||
VS_FIXEDFILEINFO *pFixedVersionInfo;
|
VS_FIXEDFILEINFO *pFixedVersionInfo;
|
||||||
UINT uiLength;
|
UINT uiLength;
|
||||||
char VersionString[MAX_PATH];
|
char VersionString[MAX_PATH];
|
||||||
|
static CHAR backslash[] = "\\";
|
||||||
DWORDLONG dwlVersion;
|
DWORDLONG dwlVersion;
|
||||||
|
|
||||||
hdl = 0x55555555;
|
hdl = 0x55555555;
|
||||||
@ -215,7 +216,7 @@ static void test_info(void)
|
|||||||
if (!boolret)
|
if (!boolret)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, &uiLength );
|
boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength );
|
||||||
ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError());
|
ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError());
|
||||||
if (!boolret)
|
if (!boolret)
|
||||||
return;
|
return;
|
||||||
|
@ -34,6 +34,9 @@ static void test_find_file(void)
|
|||||||
char filename[MAX_PATH];
|
char filename[MAX_PATH];
|
||||||
char outBuf[MAX_PATH];
|
char outBuf[MAX_PATH];
|
||||||
char windir[MAX_PATH];
|
char windir[MAX_PATH];
|
||||||
|
static CHAR empty[] = "",
|
||||||
|
regedit[] = "regedit",
|
||||||
|
regedit_exe[] = "regedit.exe";
|
||||||
|
|
||||||
memset(appdir, 0, MAX_PATH);
|
memset(appdir, 0, MAX_PATH);
|
||||||
memset(windir, 0, MAX_PATH);
|
memset(windir, 0, MAX_PATH);
|
||||||
@ -42,7 +45,7 @@ static void test_find_file(void)
|
|||||||
dwOut=MAX_PATH;
|
dwOut=MAX_PATH;
|
||||||
memset(curdir, 0, MAX_PATH);
|
memset(curdir, 0, MAX_PATH);
|
||||||
memset(outBuf, 0, MAX_PATH);
|
memset(outBuf, 0, MAX_PATH);
|
||||||
ret = VerFindFileA(0, "regedit", "", "", curdir, &dwCur, outBuf, &dwOut);
|
ret = VerFindFileA(0, regedit, empty, empty, curdir, &dwCur, outBuf, &dwOut);
|
||||||
switch(ret) {
|
switch(ret) {
|
||||||
case 0L:
|
case 0L:
|
||||||
ok(dwCur == 1, "Wrong length of buffer for current location: "
|
ok(dwCur == 1, "Wrong length of buffer for current location: "
|
||||||
@ -71,7 +74,7 @@ static void test_find_file(void)
|
|||||||
dwOut=MAX_PATH;
|
dwOut=MAX_PATH;
|
||||||
memset(curdir, 0, MAX_PATH);
|
memset(curdir, 0, MAX_PATH);
|
||||||
memset(outBuf, 0, MAX_PATH);
|
memset(outBuf, 0, MAX_PATH);
|
||||||
ret = VerFindFileA(0, "regedit.exe", "", "", curdir, &dwCur, outBuf, &dwOut);
|
ret = VerFindFileA(0, regedit_exe, empty, empty, curdir, &dwCur, outBuf, &dwOut);
|
||||||
switch(ret) {
|
switch(ret) {
|
||||||
case VFF_CURNEDEST:
|
case VFF_CURNEDEST:
|
||||||
ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "
|
ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "
|
||||||
@ -93,7 +96,7 @@ static void test_find_file(void)
|
|||||||
dwOut=MAX_PATH;
|
dwOut=MAX_PATH;
|
||||||
memset(curdir, 0, MAX_PATH);
|
memset(curdir, 0, MAX_PATH);
|
||||||
memset(outBuf, 0, MAX_PATH);
|
memset(outBuf, 0, MAX_PATH);
|
||||||
ret = VerFindFileA(0, "regedit.exe", NULL, NULL, curdir, &dwCur, outBuf, &dwOut);
|
ret = VerFindFileA(0, regedit_exe, NULL, NULL, curdir, &dwCur, outBuf, &dwOut);
|
||||||
switch(ret) {
|
switch(ret) {
|
||||||
case VFF_CURNEDEST:
|
case VFF_CURNEDEST:
|
||||||
ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "
|
ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user