ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fix removing trailing spaces from lpDefault for GetPrivateProfileString.

This commit is contained in:
James Hawkins 2008-07-16 16:25:54 -05:00 committed by Alexandre Julliard
parent e5705eae84
commit 7e9df53f38
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/kernel32/profile.c
View File

@ -1084,17 +1084,14 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry,
/* strip any trailing ' ' of def_val. */ /* strip any trailing ' ' of def_val. */
if (def_val) if (def_val)
{ {
LPCWSTR p = &def_val[strlenW(def_val)]; /* even "" works ! */ LPCWSTR p = &def_val[strlenW(def_val) - 1];
while (p > def_val) while (p > def_val && *p == ' ')
{ p--;
p--;
if ((*p) != ' ') if (p >= def_val)
break; {
} int len = (int)(p - def_val) + 1;
if (*p == ' ') /* ouch, contained trailing ' ' */
{
int len = (int)(p - def_val);
defval_tmp = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); defval_tmp = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
memcpy(defval_tmp, def_val, len * sizeof(WCHAR)); memcpy(defval_tmp, def_val, len * sizeof(WCHAR));

14
dlls/kernel32/tests/profile.c
View File

@ -418,21 +418,15 @@ static void test_GetPrivateProfileString(void)
lstrcpyA(buf, "kumquat"); lstrcpyA(buf, "kumquat");
ret = GetPrivateProfileStringA("", "name1", "default ", ret = GetPrivateProfileStringA("", "name1", "default ",
buf, MAX_PATH, filename); buf, MAX_PATH, filename);
todo_wine ok(ret == 7, "Expected 7, got %d\n", ret);
{ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf);
ok(ret == 7, "Expected 7, got %d\n", ret);
ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf);
}
/* lpAppName is empty, many blank characters in lpDefault */ /* lpAppName is empty, many blank characters in lpDefault */
lstrcpyA(buf, "kumquat"); lstrcpyA(buf, "kumquat");
ret = GetPrivateProfileStringA("", "name1", "one two ", ret = GetPrivateProfileStringA("", "name1", "one two ",
buf, MAX_PATH, filename); buf, MAX_PATH, filename);
todo_wine ok(ret == 7, "Expected 7, got %d\n", ret);
{ ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf);
ok(ret == 7, "Expected 7, got %d\n", ret);
ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf);
}
/* lpAppName is empty, blank character but not trailing in lpDefault */ /* lpAppName is empty, blank character but not trailing in lpDefault */
lstrcpyA(buf, "kumquat"); lstrcpyA(buf, "kumquat");