version/tests: Write-strings warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Wed Aug 9 15:23:21 CDT 2006
Please note: in install.c, I have preserved a distinction between "regedit"
and "regedit.exe" that was in the original code. If this distinction is
accidental, please inform me, via wine-devel, and I shall send a revised
version of this patch.
Thanks,
-- Andy.
---
Changelog:
version/tests: Write-strings warnings fix.
diff -urN a/dlls/version/tests/info.c b/dlls/version/tests/info.c
--- a/dlls/version/tests/info.c 2006-06-14 12:54:48.000000000 +0100
+++ b/dlls/version/tests/info.c 2006-08-09 19:56:32.000000000 +0100
@@ -176,6 +176,7 @@
VS_FIXEDFILEINFO *pFixedVersionInfo;
UINT uiLength;
char VersionString[MAX_PATH];
+ static CHAR backslash[] = "\\";
DWORDLONG dwlVersion;
hdl = 0x55555555;
@@ -215,7 +216,7 @@
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 -urN a/dlls/version/tests/install.c b/dlls/version/tests/install.c
--- a/dlls/version/tests/install.c 2006-06-14 12:54:30.000000000 +0100
+++ b/dlls/version/tests/install.c 2006-08-09 21:19:07.000000000 +0100
@@ -34,6 +34,9 @@
char filename[MAX_PATH];
char outBuf[MAX_PATH];
char windir[MAX_PATH];
+ static CHAR empty[] = "",
+ regedit_a[] = "regedit",
+ regedit_b[] = "regedit.exe";
memset(appdir, 0, MAX_PATH);
memset(windir, 0, MAX_PATH);
@@ -42,7 +45,7 @@
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_a, empty, empty, curdir, &dwCur, outBuf, &dwOut);
switch(ret) {
case 0L:
ok(dwCur == 1, "Wrong length of buffer for current location: "
@@ -71,7 +74,7 @@
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_b, 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 @@
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_b, 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-patches
mailing list