mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 04:00:56 +00:00
Now checks that the GCP_REORDER flag is set before trying to access
any of the fields that depend on this flag.
This commit is contained in:
parent
3c5eba06d5
commit
e33f327fe9
|
@ -2256,10 +2256,14 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount,
|
|||
memcpy(&resultsW, lpResults, sizeof(resultsW));
|
||||
|
||||
lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp);
|
||||
if(lpResults->lpOutString)
|
||||
resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, uCountW);
|
||||
else
|
||||
resultsW.lpOutString = NULL;
|
||||
if( dwFlags&GCP_REORDER )
|
||||
{
|
||||
/* If the REORDER flag is not set, this field is ignored anyways */
|
||||
if(lpResults->lpOutString)
|
||||
resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, uCountW);
|
||||
else
|
||||
resultsW.lpOutString = NULL;
|
||||
}
|
||||
|
||||
ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags);
|
||||
|
||||
|
@ -2330,21 +2334,9 @@ GetCharacterPlacementW(
|
|||
/* return number of initialized fields */
|
||||
lpResults->nGlyphs = nSet;
|
||||
|
||||
if(dwFlags==0)
|
||||
{
|
||||
/* Treat the case where no special handling was requested in a fastpath way */
|
||||
/* copy will do if the GCP_REORDER flag is not set */
|
||||
if(lpResults->lpOutString)
|
||||
lstrcpynW(lpResults->lpOutString, lpString, uCount);
|
||||
|
||||
if(lpResults->lpOrder)
|
||||
{
|
||||
for(i = 0; i < nSet; i++)
|
||||
lpResults->lpOrder[i] = i;
|
||||
}
|
||||
|
||||
} else
|
||||
if((dwFlags&GCP_REORDER)!=0)
|
||||
{
|
||||
/* MSDN says lpOutString and lpOrder are ignored if GCP_REORDER not set */
|
||||
WORD *pwCharType;
|
||||
int run_end;
|
||||
/* Keep a static table that translates the C2 types to something meaningful */
|
||||
|
@ -2365,7 +2357,7 @@ GetCharacterPlacementW(
|
|||
/* Fill in the order array with directionality values */
|
||||
GetStringTypeW(CT_CTYPE2, lpString, uCount, pwCharType);
|
||||
|
||||
/* The complete and correct (at list according to MS) BiDi algorythm is not
|
||||
/* The complete and correct (at least according to MS) BiDi algorythm is not
|
||||
* yet implemented here. Instead, we just make sure that consecutive runs of
|
||||
* the same direction (or neutral) are ordered correctly
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue