marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Fix SysReAllocStringLen implementation.

oldstable
Piotr Caban 2009-12-15 23:46:42 +01:00 committed by Alexandre Julliard
parent 17bec80f71
commit 7e3fd4e3c6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/oleaut32/oleaut.c
View File

@ -294,6 +294,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len)
return 0;
if (*old!=NULL) {
BSTR old_copy = *old;
DWORD newbytelen = len*sizeof(WCHAR);
DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD));
*old = (BSTR)(ptr+1);
@ -302,7 +303,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len)
* when 'in' is NULL!
* Some Microsoft program needs it.
*/
if (str) memmove(*old, str, newbytelen);
if (str && old_copy!=str) memmove(*old, str, newbytelen);
(*old)[len] = 0;
} else {
/*

14
dlls/oleaut32/tests/vartype.c
View File

@ -5440,6 +5440,20 @@ static void test_SysReAllocStringLen(void)
}
}
}
/* Some Windows applications use the same pointer for pbstr and psz */
str = SysAllocStringLen(szTest, 4);
ok(str != NULL, "Expected non-NULL\n");
if(str)
{
int changed;
changed = SysReAllocStringLen(&str, str, 1000000);
ok(SysStringLen(str)==1000000, "Incorrect string length\n");
ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n");
SysFreeString(str);
}
}
static void test_BstrCopy(void)