James Hawkins : msi: Only convert output strings if the call succeeded.
Alexandre Julliard
julliard at winehq.org
Tue Feb 5 06:33:56 CST 2008
Module: wine
Branch: master
Commit: 5d46eeac75d6f90bd39180671c1b9865a610af5b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d46eeac75d6f90bd39180671c1b9865a610af5b
Author: James Hawkins <truiken at gmail.com>
Date: Mon Feb 4 11:33:20 2008 -0600
msi: Only convert output strings if the call succeeded.
---
dlls/msi/msi.c | 4 +-
dlls/msi/tests/msi.c | 60 ++++++++++++++++++++------------------------------
2 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 70a9c98..c1478b3 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1543,10 +1543,10 @@ UINT WINAPI MsiGetFileVersionA(LPCSTR szFilePath, LPSTR lpVersionBuf,
ret = MsiGetFileVersionW(szwFilePath, lpwVersionBuff, pcchVersionBuf,
lpwLangBuff, pcchLangBuf);
- if( lpwVersionBuff )
+ if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwVersionBuff )
WideCharToMultiByte(CP_ACP, 0, lpwVersionBuff, -1,
lpVersionBuf, *pcchVersionBuf, NULL, NULL);
- if( lpwLangBuff )
+ if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwLangBuff )
WideCharToMultiByte(CP_ACP, 0, lpwLangBuff, -1,
lpLangBuf, *pcchLangBuf, NULL, NULL);
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index ca39249..57fe405 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -1834,15 +1834,12 @@ static void test_MsiGetFileVersion(void)
r = MsiGetFileVersionA(NULL, version, &versz, lang, &langsz);
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
- todo_wine
- {
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
- }
/* empty szFilePath */
versz = MAX_PATH;
@@ -1850,16 +1847,16 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(version, "version");
lstrcpyA(lang, "lang");
r = MsiGetFileVersionA("", version, &versz, lang, &langsz);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
todo_wine
{
ok(r == ERROR_FILE_NOT_FOUND,
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
}
/* nonexistent szFilePath */
@@ -1870,15 +1867,12 @@ static void test_MsiGetFileVersion(void)
r = MsiGetFileVersionA("nonexistent", version, &versz, lang, &langsz);
ok(r == ERROR_FILE_NOT_FOUND,
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
- todo_wine
- {
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
- }
/* nonexistent szFilePath, valid lpVersionBuf, NULL pcchVersionBuf */
versz = MAX_PATH;
@@ -1889,13 +1883,13 @@ static void test_MsiGetFileVersion(void)
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
todo_wine
{
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
}
/* nonexistent szFilePath, valid lpLangBuf, NULL pcchLangBuf */
@@ -1904,6 +1898,8 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(version, "version");
lstrcpyA(lang, "lang");
r = MsiGetFileVersionA("nonexistent", version, &versz, lang, NULL);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
@@ -1912,8 +1908,6 @@ static void test_MsiGetFileVersion(void)
{
ok(r == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", r);
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
}
/* nonexistent szFilePath, valid lpVersionBuf, pcchVersionBuf is zero */
@@ -1927,12 +1921,9 @@ static void test_MsiGetFileVersion(void)
ok(!lstrcmpA(version, "version"),
"Expected version to be unchanged, got %s\n", version);
ok(versz == 0, "Expected 0, got %d\n", versz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
- todo_wine
- {
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
- }
/* nonexistent szFilePath, valid lpLangBuf, pcchLangBuf is zero */
versz = MAX_PATH;
@@ -1942,15 +1933,12 @@ static void test_MsiGetFileVersion(void)
r = MsiGetFileVersionA("nonexistent", version, &versz, lang, &langsz);
ok(r == ERROR_FILE_NOT_FOUND,
"Expected ERROR_FILE_NOT_FOUND, got %d\n", r);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
ok(!lstrcmpA(lang, "lang"),
"Expected lang to be unchanged, got %s\n", lang);
ok(langsz == 0, "Expected 0, got %d\n", langsz);
- todo_wine
- {
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
- }
/* nonexistent szFilePath, rest NULL */
r = MsiGetFileVersionA("nonexistent", NULL, NULL, NULL, NULL);
@@ -1966,15 +1954,15 @@ static void test_MsiGetFileVersion(void)
lstrcpyA(lang, "lang");
r = MsiGetFileVersionA("ver.txt", version, &versz, lang, &langsz);
ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz);
+ ok(!lstrcmpA(version, "version"),
+ "Expected version to be unchanged, got %s\n", version);
ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz);
+ ok(!lstrcmpA(lang, "lang"),
+ "Expected lang to be unchanged, got %s\n", lang);
todo_wine
{
ok(r == ERROR_FILE_INVALID,
"Expected ERROR_FILE_INVALID, got %d\n", r);
- ok(!lstrcmpA(version, "version"),
- "Expected version to be unchanged, got %s\n", version);
- ok(!lstrcmpA(lang, "lang"),
- "Expected lang to be unchanged, got %s\n", lang);
}
DeleteFileA("ver.txt");
More information about the wine-cvs
mailing list