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

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

May 23, 2013

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

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

May 23, 2013

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

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

May 23, 2013

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

Alexandre Julliard : ntdll: Reimplement the i386 relay entry point in assembler.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: fb75238f7e3bc5611912ed7103d39f5a3c65d11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb75238f7e3bc5611912ed710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 13:16:23 2013 +0200 ntdll: Reimplement the i386 relay entry point in assembler. --- dlls/ntdll/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index f677082..6736d0f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -416,15 +416,64 @@ __ASM_GLOBAL_FUNC( call_entry_point, __ASM_CFI(".cfi_same_value %ebp\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; -} +extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); +__ASM_GLOBAL_FUNC( relay_call, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "pushl %ecx\n\t" + __ASM_CFI(".cfi_rel_offset %ecx,-12\n\t") + /* trace the parameters */ + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("relay_trace_entry") "\n\t" + /* copy the arguments*/ + "movzbl 14(%ebp),%ecx\n\t" /* number of args */ + "jecxz 1f\n\t" + "leal 0(,%ecx,4),%edx\n\t" + "subl %edx,%esp\n\t" + "andl $~15,%esp\n\t" + "movl 16(%ebp),%esi\n\t" + "addl $4,%esi\n\t" + "movl %esp,%edi\n\t" + "cld\n\t" + "rep; movsl\n\t" + "testb $2,15(%ebp)\n\t" /* (flags & 2) -> thiscall */ + "jz 1f\n\t" + "popl %ecx\n" + /* call the entry point */ + "1:\tcall *%eax\n\t" + "movl %eax,%esi\n\t" + "movl %edx,%edi\n\t" + /* trace the return value */ + "leal -20(%ebp),%esp\n\t" + "pushl %edx\n\t" + "pushl %eax\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("relay_trace_exit") "\n\t" + /* restore return value and return */ + "leal -12(%ebp),%esp\n\t" + "movl %esi,%eax\n\t" + "movl %edi,%edx\n\t" + "popl %ecx\n\t" + __ASM_CFI(".cfi_same_value %ecx\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $12" ) void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, unsigned int orig_eax, unsigned int ret_addr,

1 0

Christian Costa : d3dx9_36: Add support for D3DFMT_P8 and conversion to other ARGB formats + tests.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: edb01d2662748125b7ef7d9a1dc21419e33cad20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb01d2662748125b7ef7d9a1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:32:18 2013 +0200 d3dx9_36: Add support for D3DFMT_P8 and conversion to other ARGB formats + tests. --- dlls/d3dx9_36/d3dx9_36_private.h | 7 ++-- dlls/d3dx9_36/surface.c | 68 +++++++++++++++++++++++++++++++------ dlls/d3dx9_36/tests/surface.c | 36 +++++++++++++++++--- dlls/d3dx9_36/util.c | 14 +++++++- dlls/d3dx9_36/volume.c | 10 ++++-- 5 files changed, 110 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edb01d2662748125b7ef7…

1 0

Jacek Caban : ole32: Use a separated object to expose local servers instead of marshaling them in CoRegisterClassObject .
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 889112a29a951be278bfa84ffc05d8d8518cef61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889112a29a951be278bfa84ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:20:41 2013 +0200 ole32: Use a separated object to expose local servers instead of marshaling them in CoRegisterClassObject. --- dlls/ole32/compobj.c | 187 +++++++++++++++++++++++++++++++------ dlls/ole32/compobj_private.h | 12 +++ dlls/ole32/errorinfo.c | 10 -- dlls/ole32/rpc.c | 13 ++- dlls/ole32/tests/defaulthandler.c | 2 - 5 files changed, 181 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889112a29a951be278bfa…

1 0

Alexandre Julliard : wininet/tests: Use test.winehq. org for all certificate tests.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 147ffa0ccd84f16fa694f8b92be596283f353b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ffa0ccd84f16fa694f8b92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 19:23:17 2013 +0200 wininet/tests: Use test.winehq.org for all certificate tests. --- dlls/wininet/tests/http.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bc3505f..60fbe57 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3461,19 +3461,16 @@ static void test_cert_struct(HINTERNET req) BOOL res; static const char ex_subject[] = - "US\r\n" - "Minnesota\r\n" - "Saint Paul\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; + "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "GT98380011\r\n" + "See www.rapidssl.com/resources/cps (c)13\r\n" + "Domain Control Validated - RapidSSL(R)\r\n" + "*.winehq.org"; static const char ex_issuer[] = "US\r\n" - "Minnesota\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; + "\"GeoTrust, Inc.\"\r\n" + "RapidSSL CA"; memset(&info, 0x5, sizeof(info)); @@ -3841,9 +3838,9 @@ static void test_security_flags(void) static void test_secure_connection(void) { static const WCHAR gizmo5[] = {'G','i','z','m','o','5',0}; - static const WCHAR testbot[] = {'t','e','s','t','b','o','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR testsite[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR get[] = {'G','E','T',0}; - static const WCHAR slash[] = {'/',0}; + static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; DWORD size, flags; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; @@ -3853,12 +3850,12 @@ static void test_secure_connection(void) ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnect(ses, "testbot.winehq.org", + con = InternetConnect(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/", NULL, NULL, NULL, + req = HttpOpenRequest(con, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n"); @@ -3937,12 +3934,12 @@ static void test_secure_connection(void) ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnectW(ses, testbot, + con = InternetConnectW(ses, testsite, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestW(con, get, slash, NULL, NULL, NULL, + req = HttpOpenRequestW(con, get, testpage, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Alistair Leslie-Hughes : oledb32: DataConvert only variant length types can have a null dst.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 7a762fee023cc2585348308945d16b0b114b7e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a762fee023cc258534830894… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 14:57:39 2013 +1000 oledb32: DataConvert only variant length types can have a null dst. --- dlls/oledb32/convert.c | 7 +++++++ dlls/oledb32/tests/convert.c | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 7e09016..9d41860 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -191,6 +191,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return S_OK; } + if(dst == NULL && get_length(dst_type) != 0) + { + *dst_len = get_length(src_type); + *dst_status = DBSTATUS_S_OK; + return S_OK; + } + if(src_type == DBTYPE_STR) { BSTR b; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index bb81835..ee2a39b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -892,6 +892,13 @@ todo_wine ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len); + /* dst = NULL */ + *(int *)src = 0x4321cafe; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I4, 0, &dst_len, src, NULL, 0, 0, NULL, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_len == sizeof(i4), "got %ld\n", dst_len); + } static void test_converttoi8(void)

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BYTES-> DBTYPE_BYTES | DBTYPE_BYREF.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 72845af0a62ae3f5b63883a8976b60f6390ca300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72845af0a62ae3f5b63883a89… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 14:24:08 2013 +1000 oledb32: Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES | DBTYPE_BYREF. --- dlls/oledb32/convert.c | 19 +++++++++++++++++++ dlls/oledb32/tests/convert.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 61a2be6..7e09016 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -957,6 +957,25 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_BYTES | DBTYPE_BYREF: + { + BYTE **d = dst; + + switch(src_type) + { + case DBTYPE_BYTES: + *d = CoTaskMemAlloc(src_len); + if(*d) memcpy(*d, src, src_len); + else hr = E_OUTOFMEMORY; + + *dst_len = src_len; + *dst_status = DBSTATUS_S_OK; + return S_OK; + default: FIXME("Unimplemented conversion %04x -> DBTYPE_BYTES | DBTYPE_BYREF\n", src_type); return E_NOTIMPL; + } + break; + } + break; default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b3eda95..bb81835 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2463,6 +2463,23 @@ static void test_converttobytes(void) ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n"); } +static void test_converttobytesbyref(void) +{ + DBLENGTH dst_len; + HRESULT hr; + BYTE byte_src[] = {0, 1, 2, 4, 5}; + BYTE *dst; + DBSTATUS dst_status; + + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES | DBTYPE_BYREF, sizeof(byte_src), &dst_len, byte_src, &dst, sizeof(dst), 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(byte_src), "got %ld\n", dst_len); + ok(!memcmp(byte_src, dst, dst_len ), "bytes differ\n"); + CoTaskMemFree(dst); +} + static void test_converttodbdate(void) { DBLENGTH dst_len; @@ -2693,6 +2710,7 @@ START_TEST(convert) test_converttoui8(); test_converttovar(); test_converttobytes(); + test_converttobytesbyref(); test_converttodbdate(); test_getconversionsize(); test_converttotimestamp();

1 0

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

May 23, 2013

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