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

oleacc: Modify output buffer on incorrect role in GetRoleTextA.

This commit is contained in:
Piotr Caban 2014-05-15 17:52:33 +02:00 committed by Alexandre Julliard
parent bdc396e4f5
commit 1f6ade45c1
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/oleacc/main.c
View File

@ -373,10 +373,16 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax)
TRACE("%u %p %u\n", role, lpRole, rolemax);
length = GetRoleTextW(role, NULL, 0);
if((length == 0) || (lpRole && !rolemax))
if(lpRole && !rolemax)
return 0;
length = GetRoleTextW(role, NULL, 0);
if(!length) {
if(lpRole && rolemax)
lpRole[0] = 0;
return 0;
}
roletextW = HeapAlloc(GetProcessHeap(), 0, (length + 1)*sizeof(WCHAR));
if(!roletextW)
return 0;

12
dlls/oleacc/tests/main.c
View File

@ -38,8 +38,8 @@ static void test_getroletext(void)
buf[0] = '*';
ret = GetRoleTextA(-1, buf, 2);
ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret);
ok(buf[0] == '*' ||
broken(buf[0] == 0), /* Win98 and WinMe */
ok(buf[0] == 0 ||
broken(buf[0] == '*'), /* Win98 and WinMe */
"GetRoleTextA modified buffer on wrong role number\n");
buf[0] = '*';
ret = GetRoleTextA(-1, buf, 0);
@ -75,6 +75,14 @@ static void test_getroletext(void)
ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret);
/* use a smaller buffer */
bufW[0] = '*';
ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 0);
ok(!ret, "GetRoleTextA doesn't return 0, got %d\n", ret);
ok(buf[0] == '*', "GetRoleTextA modified buffer\n");
buffW = NULL;
ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, (WCHAR*)&buffW, 0);
ok(ret, "GetRoleTextW doesn't return length\n");
ok(buffW != NULL, "GetRoleTextW doesn't modify buffer\n");
buf[0] = '*';
ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1);
ok(ret == 0, "GetRoleTextA returned wrong length\n");