Andrew Talbot : version/tests: Write-strings warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 10 04:43:17 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: b40f4c0b177e1f94e55c80a6443d3c5dfbcce2d4
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b40f4c0b177e1f94e55c80a6443d3c5dfbcce2d4
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Wed Aug 9 22:12:44 2006 +0100
version/tests: Write-strings warnings fix.
---
dlls/version/tests/info.c | 3 ++-
dlls/version/tests/install.c | 9 ++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c
index b857b1d..8d60b0a 100644
--- a/dlls/version/tests/info.c
+++ b/dlls/version/tests/info.c
@@ -176,6 +176,7 @@ static void test_info(void)
VS_FIXEDFILEINFO *pFixedVersionInfo;
UINT uiLength;
char VersionString[MAX_PATH];
+ static CHAR backslash[] = "\\";
DWORDLONG dwlVersion;
hdl = 0x55555555;
@@ -215,7 +216,7 @@ #endif
if (!boolret)
return;
- boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, &uiLength );
+ boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength );
ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError());
if (!boolret)
return;
diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c
index 310ef4c..fd1e91c 100644
--- a/dlls/version/tests/install.c
+++ b/dlls/version/tests/install.c
@@ -34,6 +34,9 @@ static void test_find_file(void)
char filename[MAX_PATH];
char outBuf[MAX_PATH];
char windir[MAX_PATH];
+ static CHAR empty[] = "",
+ regedit[] = "regedit",
+ regedit_exe[] = "regedit.exe";
memset(appdir, 0, MAX_PATH);
memset(windir, 0, MAX_PATH);
@@ -42,7 +45,7 @@ static void test_find_file(void)
dwOut=MAX_PATH;
memset(curdir, 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) {
case 0L:
ok(dwCur == 1, "Wrong length of buffer for current location: "
@@ -71,7 +74,7 @@ static void test_find_file(void)
dwOut=MAX_PATH;
memset(curdir, 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) {
case VFF_CURNEDEST:
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;
memset(curdir, 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) {
case VFF_CURNEDEST:
ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "
More information about the wine-cvs
mailing list