May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Reimplement the x86_64 relay entry point in assembler.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 45a2cf1e227de2408fa9c3222a6cffe5182048a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a2cf1e227de2408fa9c3222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:50:46 2013 +0200 ntdll: Reimplement the x86_64 relay entry point in assembler. --- dlls/ntdll/relay.c | 59 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 6736d0f..b6790da 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -592,27 +592,36 @@ static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_ #elif defined(__x86_64__) -extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); -__ASM_GLOBAL_FUNC( call_entry_point, +extern void * WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); +__ASM_GLOBAL_FUNC( relay_call, "pushq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "pushq %rsi\n\t" - __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") - "pushq %rdi\n\t" - __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") - "movq %rcx,%rax\n\t" + "subq $0x30,%rsp\n\t" + "movq %rsi,0x20(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-16\n\t") + "movq %rdi,0x28(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-8\n\t") + /* trace the parameters */ + "movq %rcx,0x10(%rbp)\n\t" + "movq %rdx,0x18(%rbp)\n\t" + "movq %r8,0x20(%rbp)\n\t" + "call " __ASM_NAME("relay_trace_entry") "\n\t" + /* copy the arguments */ + "movzbq 0x1a(%rbp),%rdx\n\t" /* number of args */ "movq $4,%rcx\n\t" "cmp %rcx,%rdx\n\t" "cmovgq %rdx,%rcx\n\t" - "leaq 0(,%rcx,8),%rdx\n\t" + "leaq -16(,%rcx,8),%rdx\n\t" + "andq $~15,%rdx\n\t" "subq %rdx,%rsp\n\t" - "andq $~15,%rsp\n\t" + "movq 0x20(%rbp),%r8\n\t" /* original stack */ + "leaq 8(%r8),%rsi\n\t" "movq %rsp,%rdi\n\t" - "movq %r8,%rsi\n\t" "rep; movsq\n\t" + /* call the entry point */ "movq 0(%rsp),%rcx\n\t" "movq 8(%rsp),%rdx\n\t" "movq 16(%rsp),%r8\n\t" @@ -622,27 +631,29 @@ __ASM_GLOBAL_FUNC( call_entry_point, "movq %r8,%xmm2\n\t" "movq %r9,%xmm3\n\t" "callq *%rax\n\t" - "leaq -16(%rbp),%rsp\n\t" - "popq %rdi\n\t" - __ASM_CFI(".cfi_same_value %rdi\n\t") - "popq %rsi\n\t" + /* trace the return value */ + "leaq -0x30(%rbp),%rsp\n\t" + "movq 0x10(%rbp),%rcx\n\t" + "movq 0x18(%rbp),%rdx\n\t" + "movq 0x20(%rbp),%r8\n\t" + "movq %rax,%rsi\n\t" + "movaps %xmm0,0x10(%rbp)\n\t" + "movq %rax,%r9\n\t" + "call " __ASM_NAME("relay_trace_exit") "\n\t" + /* restore return value and return */ + "movq %rsi,%rax\n\t" + "movaps 0x10(%rbp),%xmm0\n\t" + "movq 0x20(%rsp),%rsi\n\t" __ASM_CFI(".cfi_same_value %rsi\n\t") + "movq 0x28(%rsp),%rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") + "movq %rbp,%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) -{ - BYTE nb_args = LOBYTE(HIWORD(idx)); - BYTE flags = HIBYTE(HIWORD(idx)); - void *func = relay_trace_entry( descr, idx, stack ); - LONGLONG ret = call_entry_point( func, nb_args, stack + 1, flags ); - relay_trace_exit( descr, idx, stack, ret ); - return ret; -} - static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) { assert(0); /* should never be called */

1 0

Akihiro Sagawa : fonts: Add default glpyh to Japanese System font.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 3f0e3ef6b4f422d0528d8031bbad3727face17dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0e3ef6b4f422d0528d8031b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 23 20:17:52 2013 +0900 fonts: Add default glpyh to Japanese System font. --- fonts/system.sfd | 2 ++ fonts/system.ttf | Bin 27496 -> 27536 bytes 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index d4df11c..499ceb4 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -5479,6 +5479,8 @@ BDFChar: 254 382 7 1 6 0 10 b]kfAr!XDr@)2[? BDFChar: 339 8240 16 0 14 0 9 E+%>6fmn,D"oo&3)k8h[B(j-4 +BDFChar: 342 8364 8 1 6 1 14 +r;?Kjr;?Kjr;?Kjr;6Np BDFChar: 348 138 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm BDFChar: 349 140 8 1 6 -1 13 diff --git a/fonts/system.ttf b/fonts/system.ttf index 25c5239..275c53b 100644 Binary files a/fonts/system.ttf and b/fonts/system.ttf differ

1 0

Akihiro Sagawa : fonts: Add default glyph to Japanese Fixedsys.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 8e2cd615c3dc884dc76bd75a77d35fc1fcaf8217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2cd615c3dc884dc76bd75a7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 23 20:17:55 2013 +0900 fonts: Add default glyph to Japanese Fixedsys. --- fonts/fixedsys_jp.sfd | 8 ++++---- fonts/fixedsys_jp.ttf | Bin 7704 -> 7704 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fonts/fixedsys_jp.sfd b/fonts/fixedsys_jp.sfd index 165608f..35bd3c3 100644 --- a/fonts/fixedsys_jp.sfd +++ b/fonts/fixedsys_jp.sfd @@ -19,7 +19,7 @@ OS2Version: 1 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1360244595 -ModificationTime: 1360589010 +ModificationTime: 1366561299 PfmFamily: 49 TTFWeight: 400 TTFWidth: 5 @@ -1084,7 +1084,7 @@ StartChar: uni00A0 Encoding: 160 160 128 Width: 8 VWidth: 0 -Flags: W +Flags: HW LayerCount: 2 EndChar @@ -2105,8 +2105,8 @@ BDFChar: 126 158 8 1 6 -1 12 r;?Kjr;?Kjr;?Kjr;6Np BDFChar: 127 159 8 1 6 -1 12 r;?Kjr;?Kjr;?Kjr;6Np -BDFChar: 128 160 8 2 2 0 0 -z +BDFChar: 128 160 8 1 6 -1 12 +r;?Kjr;?Kjr;?Kjr;6Np BDFChar: 129 161 8 1 4 0 3 @$$IX BDFChar: 130 162 8 1 5 8 13 diff --git a/fonts/fixedsys_jp.ttf b/fonts/fixedsys_jp.ttf index 947731d..39f3755 100644 Binary files a/fonts/fixedsys_jp.ttf and b/fonts/fixedsys_jp.ttf differ

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT-> DBTYPE_DATE.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 0d6eadc4a98db83c342f8252ced26b548a171b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6eadc4a98db83c342f8252c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 10:56:44 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT->DBTYPE_DATE. --- dlls/oledb32/convert.c | 21 +++++++++++++++++++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ab188ee..61a2be6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -428,6 +428,27 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch (src_type) { case DBTYPE_DBDATE: memcpy(d, src, sizeof(DBDATE)); hr = S_OK; break; + case DBTYPE_BSTR: + { + VARIANT var; + BSTR s = *(WCHAR**)src; + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(s); + + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + } + + VariantClear(&var); + } + break; case DBTYPE_VARIANT: if( V_VT((VARIANT*)src) == VT_DATE) { diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 92d3a64..b3eda95 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2467,10 +2467,12 @@ static void test_converttodbdate(void) { DBLENGTH dst_len; HRESULT hr; + static WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',0}; DBDATE ts = {2013, 5, 14}; DBDATE dst; DBSTATUS dst_status; VARIANT var; + BSTR bstr; dst_len = 0; hr = IDataConvert_DataConvert(convert, DBTYPE_DBDATE, DBTYPE_DBDATE, sizeof(ts), &dst_len, &ts, &dst, 2, 0, &dst_status, 0, 0, 0); @@ -2488,6 +2490,15 @@ static void test_converttodbdate(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + + dst_len = 0; + bstr = SysAllocString(strW); + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBDATE, 0, &dst_len, &bstr, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + SysFreeString(bstr); }

1 0

André Hentschel : advapi32/tests: Fix copy&paste typo.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 1510838d1f166a1343b144c34930aaab42b992a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510838d1f166a1343b144c34… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 23 00:45:08 2013 +0200 advapi32/tests: Fix copy&paste typo. --- dlls/advapi32/tests/registry.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b2483a7..1784118 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2156,16 +2156,16 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* try to find the value in user's classes */ - res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); /* modify the value in user's classes */ - res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + res = RegSetValueExA(hkey, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check if the value is also modified in hkcr */ - res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer );

1 0

Hans Leidekker : wbemprox: Return a status from table fillers and add an optional condition parameter .
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: aca407bfe799becf29e6cc5f615dcf990ed6d606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca407bfe799becf29e6cc5f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:09:26 2013 +0200 wbemprox: Return a status from table fillers and add an optional condition parameter. --- dlls/wbemprox/builtin.c | 66 +++++++++++++++--------- dlls/wbemprox/query.c | 7 +-- dlls/wbemprox/table.c | 3 +- dlls/wbemprox/wbemprox_private.h | 104 ++++++++++++++++++++----------------- 4 files changed, 100 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aca407bfe799becf29e6c…

1 0

Hans Leidekker : wbemprox: Avoid storing rows that don' t match the query condition.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 90e913c42fd4c82b7344e1ffefe5892c6d642d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e913c42fd4c82b7344e1ffe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:10:16 2013 +0200 wbemprox: Avoid storing rows that don't match the query condition. --- dlls/wbemprox/builtin.c | 164 +++++++++++++++++++++++++++----------- dlls/wbemprox/table.c | 35 ++++---- dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 135 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90e913c42fd4c82b7344e…

1 0

Christian Costa : d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator .
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: e7c3b03531a9642cb8cce81322906c0281fa5928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c3b03531a9642cb8cce8132… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 21 20:02:03 2013 +0200 d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator. --- dlls/d3dxof/parsing.c | 42 ++++++++++++++++-------------------------- dlls/d3dxof/tests/d3dxof.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 37cf2e1..2faf7a2 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1141,6 +1141,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { ULONG k; ULONG nb_elems = 1; + BOOL basic_type = TRUE; buf->pxo->members[i].name = pt->members[i].name; buf->pxo->members[i].start = buf->cur_pos_data; @@ -1157,26 +1158,12 @@ static BOOL parse_object_members_list(parse_buffer * buf) for (k = 0; k < nb_elems; k++) { - if (buf->txt && k) - { - token = check_TOKEN(buf); - if (token == TOKEN_COMMA) - { - get_TOKEN(buf); - } - else - { - /* Allow comma omission */ - if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER))) - return FALSE; - } - } - if (pt->members[i].type == TOKEN_NAME) { ULONG j; TRACE("Found sub-object %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); + basic_type = FALSE; buf->level++; /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) @@ -1270,23 +1257,26 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } else - { + { FIXME("Unexpected token %d\n", token); return FALSE; } } - } - - /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ - if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) - get_TOKEN(buf); - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) - { - token = get_TOKEN(buf); - if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) - return FALSE; + if (basic_type) + { + /* Handle separator only for basic types */ + token = check_TOKEN(buf); + if ((token != TOKEN_COMMA) && (token != TOKEN_SEMICOLON)) + return FALSE; + /* Allow multi-semicolons + single comma separator */ + while (check_TOKEN(buf) == TOKEN_SEMICOLON) + get_TOKEN(buf); + if (check_TOKEN(buf) == TOKEN_COMMA) + get_TOKEN(buf); + } } + buf->pxo->members[i].size = buf->cur_pos_data - buf->pxo->members[i].start; } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 52012d7..ecd4ba5 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -865,24 +865,24 @@ static void test_syntax_semicolon_comma(void) /* Test semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_txt, sizeof(object_syntax_semicolon_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test semicolon separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_bin, sizeof(object_syntax_semicolon_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_txt, sizeof(object_syntax_comma_txt) - 1); ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_comma_bin, sizeof(object_syntax_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_bin, sizeof(object_syntax_multi_semicolons_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-commas separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_commas_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); @@ -893,10 +893,10 @@ static void test_syntax_semicolon_comma(void) /* Test multi-semicolons + single comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_txt, sizeof(object_syntax_multi_semicolons_and_comma_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_bin, sizeof(object_syntax_multi_semicolons_and_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma + semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_txt, sizeof(object_syntax_comma_and_semicolon_txt) - 1); @@ -907,14 +907,14 @@ static void test_syntax_semicolon_comma(void) /* Test no ending separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_txt, sizeof(object_syntax_no_ending_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no ending separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_bin, sizeof(object_syntax_no_ending_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_txt, sizeof(object_syntax_array_no_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_bin, sizeof(object_syntax_array_no_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); @@ -925,11 +925,11 @@ static void test_syntax_semicolon_comma(void) /* Test object with mixed integer list and integers + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test integer list followed by a semicolon in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin)); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test integer list followed by a comma in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_comma_bin, sizeof(object_syntax_integer_list_comma_bin));

1 0

Akihiro Sagawa : gdi32: Add a helper to get the default character index.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: f6ea5c8a0f94c03d88376e69db31ead707ae4028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ea5c8a0f94c03d88376e69d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 22 19:46:28 2013 +0900 gdi32: Add a helper to get the default character index. --- dlls/gdi32/freetype.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bc43772..50bd52b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5817,6 +5817,25 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return glyphId; } +static FT_UInt get_default_char_index(GdiFont *font) +{ + FT_UInt default_char; + + if (FT_IS_SFNT(font->ft_face)) + { + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + } + else + { + TEXTMETRICW textm; + get_text_metrics(font, &textm); + default_char = textm.tmDefaultChar; + } + + return default_char; +} + /************************************************************* * freetype_GetGlyphIndices */ @@ -5849,17 +5868,7 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP { if (!got_default) { - if (FT_IS_SFNT(physdev->font->ft_face)) - { - TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(physdev->font->ft_face, ft_sfnt_os2); - default_char = (pOS2->usDefaultChar ? get_glyph_index(physdev->font, pOS2->usDefaultChar) : 0); - } - else - { - TEXTMETRICW textm; - get_text_metrics(physdev->font, &textm); - default_char = textm.tmDefaultChar; - } + default_char = get_default_char_index(physdev->font); got_default = TRUE; } pgi[i] = default_char;

1 0

Akihiro Sagawa : gdi32: Use the default character when the glyph is missing .
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 15aa8daf6447b6f819dfc8de15db7db7645738ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=15aa8daf6447b6f819dfc8de1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 22 19:46:31 2013 +0900 gdi32: Use the default character when the glyph is missing. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 50bd52b..e972c98 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7301,6 +7301,7 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } } + *glyph = get_default_char_index(font); return FALSE; }

1 0