Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Usp10] - Sync to Wine 1.7.14.

Browse source 
svn path=/trunk/; revision=62536
This commit is contained in:
James Tabor 2014-03-20 02:10:07 +00:00
parent 6a334be372
commit a509bf406e
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rostests/winetests/usp10/testlist.c
View file

@ -1,4 +1,7 @@
/* Automatically generated file; DO NOT EDIT!! */ /* Automatically generated by make depend; DO NOT EDIT!! */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define STANDALONE #define STANDALONE
#include <wine/test.h> #include <wine/test.h>

27
rostests/winetests/usp10/usp10.c
View file

@ -828,10 +828,9 @@ typedef struct tagRangeP {
LOGFONTA lf; LOGFONTA lf;
} fontEnumParam; } fontEnumParam;
static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpntme, DWORD FontType, LPARAM lParam )
DWORD FontType, LPARAM lParam)
{ {
NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme; NEWTEXTMETRICEXA *ntme = (NEWTEXTMETRICEXA*)lpntme;
fontEnumParam *rp = (fontEnumParam*) lParam; fontEnumParam *rp = (fontEnumParam*) lParam;
int idx = 0; int idx = 0;
DWORD i; DWORD i;
@ -853,7 +852,7 @@ static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntm
if (ntme->ntmFontSig.fsUsb[idx] & mask) if (ntme->ntmFontSig.fsUsb[idx] & mask)
{ {
memcpy(&(rp->lf),lpelfe,sizeof(LOGFONT)); memcpy(&(rp->lf),lpelfe,sizeof(LOGFONTA));
return 0; return 0;
} }
return 1; return 1;
@ -865,7 +864,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co
fontEnumParam lParam; fontEnumParam lParam;
lParam.range = range; lParam.range = range;
memset(&lParam.lf,0,sizeof(LOGFONT)); memset(&lParam.lf,0,sizeof(LOGFONTA));
*hfont = NULL; *hfont = NULL;
if (recommended) if (recommended)
@ -884,7 +883,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co
if (!*hfont) if (!*hfont)
{ {
memset(&lParam.lf,0,sizeof(LOGFONT)); memset(&lParam.lf,0,sizeof(LOGFONTA));
lParam.lf.lfCharSet = DEFAULT_CHARSET; lParam.lf.lfCharSet = DEFAULT_CHARSET;
if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0]) if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0])
@ -1812,10 +1811,10 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
struct enum_font_data struct enum_font_data
{ {
int total; int total;
ENUMLOGFONT elf[MAX_ENUM_FONTS]; ENUMLOGFONTA elf[MAX_ENUM_FONTS];
}; };
static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) static INT CALLBACK enum_bitmap_font_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)
{ {
struct enum_font_data *efnd = (struct enum_font_data *)lParam; struct enum_font_data *efnd = (struct enum_font_data *)lParam;
@ -1823,7 +1822,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n
if (efnd->total < MAX_ENUM_FONTS) if (efnd->total < MAX_ENUM_FONTS)
{ {
efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf;
} }
else else
trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS);
@ -1831,7 +1830,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n
return 1; return 1;
} }
static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) static INT CALLBACK enum_truetype_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)
{ {
struct enum_font_data *efnd = (struct enum_font_data *)lParam; struct enum_font_data *efnd = (struct enum_font_data *)lParam;
@ -1839,7 +1838,7 @@ static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm,
if (efnd->total < MAX_ENUM_FONTS) if (efnd->total < MAX_ENUM_FONTS)
{ {
efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf;
} }
else else
trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS);
@ -1853,7 +1852,7 @@ static void test_ScriptGetFontProperties(HDC hdc)
SCRIPT_CACHE psc,old_psc; SCRIPT_CACHE psc,old_psc;
SCRIPT_FONTPROPERTIES sfp; SCRIPT_FONTPROPERTIES sfp;
HFONT font, oldfont; HFONT font, oldfont;
LOGFONT lf; LOGFONTA lf;
struct enum_font_data efnd; struct enum_font_data efnd;
TEXTMETRICA tmA; TEXTMETRICA tmA;
WORD gi[3]; WORD gi[3];
@ -1937,7 +1936,7 @@ static void test_ScriptGetFontProperties(HDC hdc)
for (i = 0; i < efnd.total; i++) for (i = 0; i < efnd.total; i++)
{ {
lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName);
font = CreateFontIndirect(&lf); font = CreateFontIndirectA(&lf);
oldfont = SelectObject(hdc, font); oldfont = SelectObject(hdc, font);
sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);
@ -1978,7 +1977,7 @@ static void test_ScriptGetFontProperties(HDC hdc)
for (i = 0; i < efnd.total; i++) for (i = 0; i < efnd.total; i++)
{ {
lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName);
font = CreateFontIndirect(&lf); font = CreateFontIndirectA(&lf);
oldfont = SelectObject(hdc, font); oldfont = SelectObject(hdc, font);
sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);