usp10: Update tests in test_ScriptItemIzeShapePlace to match Windows results.
This commit is contained in:
parent
5f529fe0d8
commit
beb097fc93
|
@ -44,8 +44,8 @@ static void test_ScriptItemIzeShapePlace(unsigned short pwOutGlyphs[256])
|
||||||
int cMaxItems;
|
int cMaxItems;
|
||||||
SCRIPT_ITEM pItem[255];
|
SCRIPT_ITEM pItem[255];
|
||||||
int pcItems;
|
int pcItems;
|
||||||
WCHAR TestItem1[6] = {'T', 'e', 's', 't', 0x0166, 0};
|
WCHAR TestItem1[6] = {'T', 'e', 's', 't', 'a', 0};
|
||||||
WCHAR TestItem2[6] = {'T', 'e', 's', 't', 0x0166, 0};
|
WCHAR TestItem2[6] = {'T', 'e', 's', 't', 'b', 0};
|
||||||
|
|
||||||
SCRIPT_CACHE psc;
|
SCRIPT_CACHE psc;
|
||||||
int cChars;
|
int cChars;
|
||||||
|
@ -58,6 +58,8 @@ static void test_ScriptItemIzeShapePlace(unsigned short pwOutGlyphs[256])
|
||||||
int piAdvance[256];
|
int piAdvance[256];
|
||||||
GOFFSET pGoffset[256];
|
GOFFSET pGoffset[256];
|
||||||
ABC pABC[256];
|
ABC pABC[256];
|
||||||
|
LOGFONTW lf;
|
||||||
|
HFONT zfont;
|
||||||
int cnt;
|
int cnt;
|
||||||
|
|
||||||
/* We need a valid HDC to drive a lot of Script functions which requires the following *
|
/* We need a valid HDC to drive a lot of Script functions which requires the following *
|
||||||
|
@ -71,6 +73,18 @@ static void test_ScriptItemIzeShapePlace(unsigned short pwOutGlyphs[256])
|
||||||
hdc = GetDC(hwnd); /* We now have a hdc */
|
hdc = GetDC(hwnd); /* We now have a hdc */
|
||||||
ok( hdc != NULL, "HDC failed to be created %p\n", hdc);
|
ok( hdc != NULL, "HDC failed to be created %p\n", hdc);
|
||||||
|
|
||||||
|
lstrcpyW(lf.lfFaceName, (WCHAR *) "Courier");
|
||||||
|
lf.lfHeight = 10;
|
||||||
|
lf.lfItalic = 0;
|
||||||
|
lf.lfEscapement = 0;
|
||||||
|
lf.lfOrientation = 0;
|
||||||
|
lf.lfUnderline = 0;
|
||||||
|
lf.lfStrikeOut = 0;
|
||||||
|
lf.lfWeight = 3;
|
||||||
|
lf.lfWidth = 10;
|
||||||
|
|
||||||
|
zfont = (HFONT) SelectObject(hdc, CreateFontIndirectW(&lf));
|
||||||
|
|
||||||
/* Start testing usp10 functions */
|
/* Start testing usp10 functions */
|
||||||
/* This test determines that the pointer returned by ScriptGetProperties is valid
|
/* This test determines that the pointer returned by ScriptGetProperties is valid
|
||||||
* by checking a known value in the table */
|
* by checking a known value in the table */
|
||||||
|
@ -144,9 +158,12 @@ static void test_ScriptItemIzeShapePlace(unsigned short pwOutGlyphs[256])
|
||||||
ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
|
ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
|
||||||
ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs);
|
ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs);
|
||||||
if (hr ==0) {
|
if (hr ==0) {
|
||||||
|
hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance,
|
||||||
|
pGoffset, pABC);
|
||||||
|
ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr);
|
||||||
hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance,
|
hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance,
|
||||||
pGoffset, pABC);
|
pGoffset, pABC);
|
||||||
ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr);
|
ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr);
|
||||||
for (cnt=0; cnt < pcGlyphs; cnt++)
|
for (cnt=0; cnt < pcGlyphs; cnt++)
|
||||||
pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */
|
pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */
|
||||||
}
|
}
|
||||||
|
@ -180,7 +197,7 @@ static void test_ScriptItemIzeShapePlace(unsigned short pwOutGlyphs[256])
|
||||||
ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n",
|
ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n",
|
||||||
cnt, TestItem2[cnt], pwOutGlyphs2[cnt]);
|
cnt, TestItem2[cnt], pwOutGlyphs2[cnt]);
|
||||||
if (hr ==0) {
|
if (hr ==0) {
|
||||||
hr = ScriptPlace(NULL, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance,
|
hr = ScriptPlace(hdc, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance,
|
||||||
pGoffset, pABC);
|
pGoffset, pABC);
|
||||||
ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr);
|
ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue