wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Łukasz Wojniłowicz : Polish translation for release 1.7.5
by Jeremy Newman 28 Oct '13

28 Oct '13

Module: website Branch: master Commit: d3b40f350bc9039997521b71bc8842070d2ba2b8 URL: http://source.winehq.org/git/website.git/?a=commit;h=d3b40f350bc9039997521b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 25 20:21:47 2013 +0200 Polish translation for release 1.7.5 --- news/pl/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2013102501.xml b/news/pl/2013102501.xml new file mode 100644 index 0000000..0d5fcd5 --- /dev/null +++ b/news/pl/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 25, 2013</date> +<title>Wydano Wine 1.7.5</title> +<body> + Wydanie rozwojowe Wine 1.7.5 jest już dostępne. + <a href="{$root}/announce/1.7.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wolnych od rejestracji komponentów COM przy użyciu kontekstów aktywacji.</li> + <li>Ulepszone wsparcie dla wytłuszczania czcionek metodą symulowania.</li> + <li>Uaktualniono dane Unicode do Unicode 6.3.</li> + <li>Lepsze wsparcie dla rejestracji bibliotek typelib na 64-bitach.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.5
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: website Branch: master Commit: 023a32ffdced3af5c57b0f618166d7e08b09fbe2 URL: http://source.winehq.org/git/website.git/?a=commit;h=023a32ffdced3af5c57b0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:53:58 2013 +0200 Wine release 1.7.5 --- news/en/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013102501.xml b/news/en/2013102501.xml new file mode 100644 index 0000000..ff76580 --- /dev/null +++ b/news/en/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>October 25, 2013</date> +<title>Wine 1.7.5 Released</title> +<body> + The Wine development release 1.7.5 is now available. + <a href="{$root}/announce/1.7.5">What's new</a> in this release: +<ul> + <li>Support for registration-free COM using activation contexts.</li> + <li>Improved support for simulated bold fonts.</li> + <li>Unicode data updated to Unicode 6.3.</li> + <li>Better support for typelib registration on 64-bit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.5 : Alexandre Julliard : Release 1.7.5
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: refs/tags/wine-1.7.5 Tag: 25e56f72edb0f83c0ef56865a2e7844bc3faf675 URL: http://source.winehq.org/git/wine.git/?a=tag;h=25e56f72edb0f83c0ef56865a2e7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:45:31 2013 +0200 Release 1.7.5

1 0

Alexandre Julliard : Release 1.7.5.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 4b9465f41686d2314ce4d1c95b782db81695ff7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9465f41686d2314ce4d1c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:45:30 2013 +0200 Release 1.7.5. --- ANNOUNCE | 828 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 462 insertions(+), 390 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b9465f41686d2314ce4d…

1 0

Stefan Dösinger : d3d8/tests: Port z_range_test to d3d8.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 9db01c16acd99f629b7248d95ffc37e0c9cf3e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db01c16acd99f629b7248d95… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 25 00:48:01 2013 +0200 d3d8/tests: Port z_range_test to d3d8. --- dlls/d3d8/tests/visual.c | 234 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 200 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9db01c16acd99f629b724…

1 0

Piotr Caban : msvcrt: Add __security_error_handler stub.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: e3592d041a42f4e8365825ab3dab5c2addbe1fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3592d041a42f4e8365825ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 25 14:12:43 2013 +0200 msvcrt: Add __security_error_handler stub. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/except.c | 11 +++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 49b2dff..fbd4506 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -194,7 +194,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b0602b8..5f536c0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -189,7 +189,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b77daa1..8cafba6 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -303,3 +303,14 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler( security_error_handler = handler; return old; } + +/* __security_error_handler - not exported in native msvcrt */ +void CDECL __security_error_handler(int code, void *data) +{ + if(security_error_handler) + security_error_handler(code, data); + else + FIXME("(%d, %p) stub\n", code, data); + + MSVCRT__exit(3); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43daf0f..5e57aae 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1528,6 +1528,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) @ cdecl _set_security_error_handler(ptr) +@ cdecl __security_error_handler(long ptr) @ cdecl -arch=i386 _statusfp2(ptr ptr) @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output

1 0

Francois Gouget : crypt32: Make add_cert_to_store() static.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: ca894127f82e9687cfbf586e55223b9b8832202b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca894127f82e9687cfbf586e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 25 11:45:09 2013 +0200 crypt32: Make add_cert_to_store() static. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1858a1b..bc0f26d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -162,7 +162,7 @@ static const context_vtbl_t cert_vtbl = { Cert_clone }; -BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, +static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context) { const CERT_CONTEXT *existing = NULL;

1 0

André Hentschel : winspool.drv/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 2a319e2cdd6263a87178220bd5aeacdcd8077297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a319e2cdd6263a87178220bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:06:43 2013 +0200 winspool.drv/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/winspool.drv/tests/Makefile.in | 1 - dlls/winspool.drv/tests/info.c | 174 +++++++++++++++++------------------ 2 files changed, 86 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a319e2cdd6263a871782…

1 0

André Hentschel : psapi/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 3df00e29eee8df8859cbd8db353800248617bec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df00e29eee8df8859cbd8db3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:04 2013 +0200 psapi/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/psapi/tests/Makefile.in | 1 - dlls/psapi/tests/psapi_main.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index f64a5d0..849e3e5 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = psapi.dll -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b91add6..ee7e8bd 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -81,7 +81,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); - pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory"); + pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -105,7 +105,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -134,8 +134,8 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(hMod == GetModuleHandle(NULL), - "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); /* Windows sometimes has a bunch of extra dlls, presumably brought in by * aclayers.dll. @@ -158,7 +158,7 @@ static void test_EnumProcessModules(void) static void test_GetModuleInformation(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); MODULEINFO info; DWORD ret; @@ -247,7 +247,7 @@ todo_wine static void test_GetMappedFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName; DWORD ret; char *base; @@ -288,26 +288,26 @@ todo_wine } } - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); drive[0] = file_name[0]; drive[1] = ':'; drive[2] = 0; SetLastError(0xdeadbeef); - ret = QueryDosDevice(drive, device_name, sizeof(device_name)); - ok(ret, "QueryDosDevice error %d\n", GetLastError()); + ret = QueryDosDeviceA(drive, device_name, sizeof(device_name)); + ok(ret, "QueryDosDeviceA error %d\n", GetLastError()); trace("%s -> %s\n", drive, device_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFileA(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN); SetEndOfFile(hfile); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -382,11 +382,11 @@ todo_wine UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile); - DeleteFile(file_name); + DeleteFileA(file_name); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -404,7 +404,7 @@ todo_wine static void test_GetProcessImageFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szImgPath[MAX_PATH], szMapPath[MAX_PATH]; WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; @@ -482,7 +482,7 @@ static void test_GetProcessImageFileName(void) static void test_GetModuleFileNameEx(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; WCHAR buffer[MAX_PATH]; DWORD ret; @@ -541,7 +541,7 @@ static void test_GetModuleFileNameEx(void) static void test_GetModuleBaseName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModPath[MAX_PATH], szModBaseName[MAX_PATH]; DWORD ret;

1 0

André Hentschel : usp10/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: f309e012828430ff11a30d157b09adab2049f741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f309e012828430ff11a30d157… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:29:43 2013 +0200 usp10/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/usp10/tests/Makefile.in | 1 - dlls/usp10/tests/usp10.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/Makefile.in b/dlls/usp10/tests/Makefile.in index b2a7451..954a4a8 100644 --- a/dlls/usp10/tests/Makefile.in +++ b/dlls/usp10/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = usp10.dll IMPORTS = usp10 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ usp10.c diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 354bc23..22a4ab2 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -825,10 +825,9 @@ typedef struct tagRangeP { LOGFONTA lf; } fontEnumParam; -static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, - DWORD FontType, LPARAM lParam) +static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpntme, DWORD FontType, LPARAM lParam ) { - NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme; + NEWTEXTMETRICEXA *ntme = (NEWTEXTMETRICEXA*)lpntme; fontEnumParam *rp = (fontEnumParam*) lParam; int idx = 0; DWORD i; @@ -850,7 +849,7 @@ static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntm if (ntme->ntmFontSig.fsUsb[idx] & mask) { - memcpy(&(rp->lf),lpelfe,sizeof(LOGFONT)); + memcpy(&(rp->lf),lpelfe,sizeof(LOGFONTA)); return 0; } return 1; @@ -862,7 +861,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co fontEnumParam lParam; lParam.range = range; - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); *hfont = NULL; if (recommended) @@ -881,7 +880,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (!*hfont) { - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); lParam.lf.lfCharSet = DEFAULT_CHARSET; if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0]) @@ -1809,10 +1808,10 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) struct enum_font_data { 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; @@ -1820,7 +1819,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1828,7 +1827,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n 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; @@ -1836,7 +1835,7 @@ static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1850,7 +1849,7 @@ static void test_ScriptGetFontProperties(HDC hdc) SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; HFONT font, oldfont; - LOGFONT lf; + LOGFONTA lf; struct enum_font_data efnd; TEXTMETRICA tmA; WORD gi[3]; @@ -1934,7 +1933,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); @@ -1975,7 +1974,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013