October 2015 - Wine-Commits

Aric Stewart : usp10/tests: Catch case where enumerated font name is too long.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 0072188b69df43460d213f12efe06bb17720de93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072188b69df43460d213f12e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 25 10:11:26 2015 -0500 usp10/tests: Catch case where enumerated font name is too long. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0db98d9..92b17c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1993,6 +1993,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); @@ -2034,6 +2039,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font);

1 0

Charles Davis : ntdll: Use an __ms_va_list in sscanf (Clang).
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 476d97b0eea4ad231e4341add5fcc4b419b6a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=476d97b0eea4ad231e4341add… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sat Sep 19 13:26:44 2015 -0600 ntdll: Use an __ms_va_list in sscanf (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- dlls/ntdll/string.c | 594 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 590 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476d97b0eea4ad231e434…

1 0

Nikolay Sivov : gdi32: Return font ids from GetFontRealizationInfo().
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 7f4c158a39cbd4e545703e0bcb808d19864a8707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4c158a39cbd4e545703e0bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:41:20 2015 +0300 gdi32: Return font ids from GetFontRealizationInfo(). --- dlls/gdi32/freetype.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d870b8c5..de40d9f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -296,6 +296,68 @@ typedef struct { typedef struct tagGdiFont GdiFont; +#define FIRST_FONT_HANDLE 1 +#define MAX_FONT_HANDLES 256 + +struct font_handle_entry +{ + void *obj; + WORD generation; /* generation count for reusing handle values */ +}; + +static struct font_handle_entry font_handles[MAX_FONT_HANDLES]; +static struct font_handle_entry *next_free; +static struct font_handle_entry *next_unused = font_handles; + +static inline DWORD entry_to_handle( struct font_handle_entry *entry ) +{ + unsigned int idx = entry - font_handles + FIRST_FONT_HANDLE; + return idx | (entry->generation << 16); +} + +static inline struct font_handle_entry *handle_entry( DWORD handle ) +{ + unsigned int idx = LOWORD(handle) - FIRST_FONT_HANDLE; + + if (idx < MAX_FONT_HANDLES) + { + if (!HIWORD( handle ) || HIWORD( handle ) == font_handles[idx].generation) + return &font_handles[idx]; + } + if (handle) WARN( "invalid handle 0x%08x\n", handle ); + return NULL; +} + +static DWORD alloc_font_handle( void *obj ) +{ + struct font_handle_entry *entry; + + entry = next_free; + if (entry) + next_free = entry->obj; + else if (next_unused < font_handles + MAX_FONT_HANDLES) + entry = next_unused++; + else + { + ERR( "out of realized font handles\n" ); + return 0; + } + entry->obj = obj; + if (++entry->generation == 0xffff) entry->generation = 1; + return entry_to_handle( entry ); +} + +static void free_font_handle( DWORD handle ) +{ + struct font_handle_entry *entry; + + if ((entry = handle_entry( handle ))) + { + entry->obj = next_free; + next_free = entry; + } +} + typedef struct { struct list entry; Face *face; @@ -337,6 +399,7 @@ struct tagGdiFont { VOID *GSUB_Table; const VOID *vert_feature; DWORD cache_num; + DWORD instance_id; }; typedef struct { @@ -4423,6 +4486,7 @@ static GdiFont *alloc_font(void) ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; ret->total_kern_pairs = (DWORD)-1; ret->kern_pairs = NULL; + ret->instance_id = alloc_font_handle(ret); list_init(&ret->child_fonts); return ret; } @@ -4441,6 +4505,7 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, child); } + free_font_handle(font->instance_id); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); @@ -8180,7 +8245,7 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) info->flags |= 2; info->cache_num = physdev->font->cache_num; - info->instance_id = -1; + info->instance_id = physdev->font->instance_id; if (info->size == sizeof(*info)) { info->unk = 0;

1 0

Aric Stewart : secur32/tests: Handle skip cleanup in negotiate more cleanly.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: e8d54db727fd7c38c47157a94790018c0e1a131e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d54db727fd7c38c47157a94… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 11:04:59 2015 -0500 secur32/tests: Handle skip cleanup in negotiate more cleanly. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/secur32/tests/negotiate.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 91c3fa1..4f07dbe 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -262,6 +262,9 @@ static void test_authentication(void) SecPkgInfoA *pi; BOOL first = TRUE; + memset(&client, 0, sizeof(client)); + memset(&server, 0, sizeof(server)); + id.User = (unsigned char *)"user"; id.UserLength = strlen( "user" ); id.Domain = (unsigned char *)"domain"; @@ -342,17 +345,29 @@ done: cleanup_buffers( &client ); cleanup_buffers( &server ); - status_c = pDeleteSecurityContext( &client.ctxt ); - ok( status_c == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_c ); + if (client.ctxt.dwLower || client.ctxt.dwUpper) + { + status_c = pDeleteSecurityContext( &client.ctxt ); + ok( status_c == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_c ); + } - status_s = pDeleteSecurityContext( &server.ctxt ); - ok( status_s == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_s ); + if (server.ctxt.dwLower || server.ctxt.dwUpper) + { + status_s = pDeleteSecurityContext( &server.ctxt ); + ok( status_s == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_s ); + } - status_c = pFreeCredentialsHandle( &client.cred ); - ok( status_c == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_c ); + if (client.cred.dwLower || client.cred.dwUpper) + { + status_c = pFreeCredentialsHandle( &client.cred ); + ok( status_c == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_c ); + } - status_s = pFreeCredentialsHandle(&server.cred); - ok( status_s == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_s ); + if (server.cred.dwLower || server.cred.dwUpper) + { + status_s = pFreeCredentialsHandle(&server.cred); + ok( status_s == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_s ); + } } START_TEST(negotiate)

1 0

Bruno Jesus : msadpcm32.acm: Stop converting data instead of crashing.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 72528be84fdc0dcfe75e361f4bf7c09fc27b638d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72528be84fdc0dcfe75e361f4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 29 22:06:21 2015 +0800 msadpcm32.acm: Stop converting data instead of crashing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/msadp32.acm/msadp32.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 2c61575..24e0c6a 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -249,9 +249,17 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Tomb Raider III (bug 21000) where it passes + * invalid data after a valid sequence of blocks */ + if (*src > 6 || *(src + 1) > 6) + { + /* Recalculate the amount of used output buffer. We are not changing + * nsrc, let's assume the bad data was parsed */ + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeffL = MSADPCM_CoeffSet[*src++]; - assert(*src <= 6); coeffR = MSADPCM_CoeffSet[*src++]; ideltaL = R16(src); src += 2;

1 0

Andrew Eikum : xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: b28b4cc18d412697aeedfa955b7cba0c15f2deb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28b4cc18d412697aeedfa955… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:55:53 2015 -0500 xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8b41cbb..673f53d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1132,6 +1132,9 @@ static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, { IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVoiceDetails); + pVoiceDetails->CreationFlags = 0; + pVoiceDetails->InputChannels = This->fmt.Format.nChannels; + pVoiceDetails->InputSampleRate = This->fmt.Format.nSamplesPerSec; } static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface,

1 0

Vincent Povirk : setupapi/tests: Add tests for dirid values.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: f0009e17e44e8832ec44dce5c00ccc5c237ee981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0009e17e44e8832ec44dce5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 26 12:39:39 2015 -0500 setupapi/tests: Add tests for dirid values. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/setupapi/tests/install.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a98cbec..10161f0 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -720,6 +720,55 @@ static void test_inffilelist(void) RemoveDirectoryA(dirA); } +static const char dirid_inf[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=Add.Settings\n" + "[Add.Settings]\n" + "HKCU,Software\\Wine\\setupapitest,dirid,,%%%i%%\n"; + +static void check_dirid(int dirid, LPCSTR expected) +{ + char buffer[sizeof(dirid_inf)+11]; + char path[MAX_PATH], actual[MAX_PATH]; + LONG ret; + DWORD size; + + sprintf(buffer, dirid_inf, dirid); + + create_inf_file(inffile, buffer); + + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + size = sizeof(actual); + ret = RegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", "dirid", + RRF_RT_REG_SZ|RRF_ZEROONFAILURE, NULL, &actual, &size); + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); + ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual); + + ok_registry(TRUE); + ret = DeleteFileA(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); +} + +/* Test dirid values */ +static void test_dirid(void) +{ + char expected[MAX_PATH]; + + check_dirid(DIRID_NULL, ""); + + GetWindowsDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_WINDOWS, expected); + + GetSystemDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_SYSTEM, expected); + + strcat(expected, "\\unknown"); + check_dirid(40, expected); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -770,6 +819,7 @@ START_TEST(install) test_registry(); test_install_svc_from(); test_driver_install(); + test_dirid(); UnhookWindowsHookEx(hhook);

1 0

Andrew Eikum : xaudio2: Call OnStreamEnd callback.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 8366165e4069dd761f3c5bf386b13d675a593327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8366165e4069dd761f3c5bf38… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:56:02 2015 -0500 xaudio2: Call OnStreamEnd callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/xaudio2_7/xaudio_dll.c | 5 +++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 2cea7af..716fe23 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -374,9 +374,11 @@ static const IXAudio2VoiceCallbackVtbl vcb_buf_vtbl = { static IXAudio2VoiceCallback vcb_buf = { &vcb_buf_vtbl }; static int nloopends = 0; +static int nstreamends = 0; static void WINAPI loop_buf_OnStreamEnd(IXAudio2VoiceCallback *This) { + ++nstreamends; } static void WINAPI loop_buf_OnBufferStart(IXAudio2VoiceCallback *This, @@ -421,7 +423,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) XAUDIO2_BUFFER buf; XAUDIO2_VOICE_STATE state; struct vcb_buf_testdata testdata[5]; - int i; + int i, timeout; obs_calls = 0; obe_calls = 0; @@ -434,6 +436,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + /* test OnBufferStart/End callbacks */ fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt.nChannels = 2; fmt.nSamplesPerSec = 44100; @@ -487,14 +490,48 @@ static void test_buffer_callbacks(IXAudio2 *xa) ok(state.SamplesPlayed == 4410 * 5, "Got wrong samples played\n"); - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); + if(xaudio27) + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + else + IXAudio2SourceVoice_DestroyVoice(src); + + + /* test OnStreamEnd callback */ + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + buf.Flags = XAUDIO2_END_OF_STREAM; + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + timeout = 0; + while(nstreamends == 0 && timeout < 1000){ + Sleep(100); + timeout += 100; + } + + ok(nstreamends == 1, "Got wrong number of OnStreamEnd calls: %u\n", nstreamends); + + /* xaudio resets SamplesPlayed after processing an end-of-stream buffer */ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + ok(state.SamplesPlayed == 0, "Got wrong samples played\n"); if(xaudio27) IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); else IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); } static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 673f53d..41d1d21 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -3092,9 +3092,14 @@ static void update_source_state(XA2SourceImpl *src) TRACE("%p: done with buffer %u\n", src, old_buf); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + src->played_frames = 0; + if(src->cb){ IXAudio2VoiceCallback_OnBufferEnd(src->cb, src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); if(src->nbufs > 0) IXAudio2VoiceCallback_OnBufferStart(src->cb,

1 0

Thomas Faller : winex11.drv: Fix use of uninitialized memory.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 587733855b55725d637e044ad9ac0232a79de919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587733855b55725d637e044ad… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Sep 24 23:44:17 2015 +0200 winex11.drv: Fix use of uninitialized memory. --- dlls/winex11.drv/clipboard.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6c6b3b9..842ebfe 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -367,8 +367,19 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) if (!format->drvData) { - GetClipboardFormatNameW( format->wFormatID, buffer, 256 ); - len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + if (GetClipboardFormatNameW(format->wFormatID, buffer, 256) > 0) + { + /* use defined format name */ + len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + } + else + { + /* create a name in the same way as ntdll/atom.c:integral_atom_name + * which is normally used by GetClipboardFormatNameW + */ + static const WCHAR fmt[] = {'#','%','u',0}; + len = sprintfW(buffer, fmt, format->wFormatID) + 1; + } names[i] = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, names[i++], len, NULL, NULL); }

1 0

Aric Stewart : usp10/tests: fix some tests on Hebrew and Arabic locales.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 6b657e0760ff029e88d3fa8c9f937b70d9eda983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b657e0760ff029e88d3fa8c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 13:05:42 2015 -0500 usp10/tests: fix some tests on Hebrew and Arabic locales. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 92b17c5..bfd84d4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1921,7 +1921,7 @@ static void test_ScriptGetFontProperties(HDC hdc) /* U+0020: numeric space U+200B: zero width space U+F71B: unknown, found by black box testing */ - BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); + BOOL is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -2019,10 +2019,12 @@ static void test_ScriptGetFontProperties(HDC hdc) ret = GetTextMetricsA(hdc, &tmA); ok(ret != 0, "GetTextMetricsA failed!\n"); - is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); - ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + ret = pGetGlyphIndicesW(hdc, invalids, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + + ok(sfp.wgBlank == tmA.tmBreakChar || sfp.wgBlank == gi[0], "bitmap font %s wgBlank %04x tmBreakChar %04x Space %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar, gi[0]); - ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + ok(sfp.wgDefault == 0 || sfp.wgDefault == tmA.tmDefaultChar || broken(sfp.wgDefault == (0x100 | tmA.tmDefaultChar)), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank);

1 0