October 2009 - Wine-commits

Juan Lang : crypt32: Trace netscape cert type extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: bcb4bc6be3ca1b1245dc4e4750179f04f4b9ef26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb4bc6be3ca1b1245dc4e475… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 14:11:27 2009 -0700 crypt32: Trace netscape cert type extension. --- dlls/crypt32/chain.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5e09cd7..1b26bf3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -936,6 +936,32 @@ static void dump_enhanced_key_usage(const CERT_EXTENSION *ext) } } +static void dump_netscape_cert_type(const CERT_EXTENSION *ext) +{ + CRYPT_BIT_BLOB usage; + DWORD size = sizeof(usage); + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_BITS, ext->Value.pbData, + ext->Value.cbData, CRYPT_DECODE_NOCOPY_FLAG, NULL, &usage, &size)) + { +#define trace_cert_type_bit(bits, bit) \ + if ((bits) & (bit)) TRACE_(chain)("%s\n", #bit) + if (usage.cbData) + { + trace_cert_type_bit(usage.pbData[0], + NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], + NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], NETSCAPE_SMIME_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], NETSCAPE_SIGN_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], NETSCAPE_SSL_CA_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], NETSCAPE_SMIME_CA_CERT_TYPE); + trace_cert_type_bit(usage.pbData[0], NETSCAPE_SIGN_CA_CERT_TYPE); + } +#undef trace_cert_type_bit + } +} + static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), @@ -960,6 +986,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_cert_policies(ext); else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE)) dump_enhanced_key_usage(ext); + else if (!strcmp(ext->pszObjId, szOID_NETSCAPE_CERT_TYPE)) + dump_netscape_cert_type(ext); } static LPCWSTR filetime_to_str(const FILETIME *time)

1 0

Juan Lang : crypt32: Support IPv6 addresses in name constraint comparison.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 24399bd3599101bc8f1600cf0c13a54483662bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=24399bd3599101bc8f1600cf0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 14:38:47 2009 -0700 crypt32: Support IPv6 addresses in name constraint comparison. --- dlls/crypt32/chain.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1b26bf3..e8f9de3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -548,9 +548,13 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, TRACE("(%d, %p), (%d, %p)\n", constraint->cbData, constraint->pbData, name->cbData, name->pbData); - if (constraint->cbData != sizeof(DWORD) * 2) + /* RFC5280, section 4.2.1.10, iPAddress syntax: either 8 or 32 bytes, for + * IPv4 or IPv6 addresses, respectively. + */ + if (constraint->cbData != sizeof(DWORD) * 2 && constraint->cbData != 32) *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; - else if (name->cbData == sizeof(DWORD)) + else if (name->cbData == sizeof(DWORD) && + constraint->cbData == sizeof(DWORD) * 2) { DWORD subnet, mask, addr; @@ -562,6 +566,19 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, */ match = (subnet & mask) == (addr & mask); } + else if (name->cbData == 16 && constraint->cbData == 32) + { + const BYTE *subnet, *mask, *addr; + DWORD i; + + subnet = constraint->pbData; + mask = constraint->pbData + 16; + addr = name->pbData; + match = TRUE; + for (i = 0; match && i < 16; i++) + if ((subnet[i] & mask[i]) != (addr[i] & mask[i])) + match = FALSE; + } /* else: name is wrong size, no match */ return match;

1 0

Juan Lang : crypt32: Add the Google website's cert to tests.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 3669be9550048bd7aa35934ebf875d88d651884c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3669be9550048bd7aa35934eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 27 15:11:22 2009 -0700 crypt32: Add the Google website's cert to tests. --- dlls/crypt32/tests/chain.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3669be9550048bd7aa359…

1 0

Alexandre Julliard : libwine: Fix handling of precision argument in vsnprintfW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: eff7762d0a4d3e62ef25a7a4566a62689eebf331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff7762d0a4d3e62ef25a7a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 13:05:37 2009 +0100 libwine: Fix handling of precision argument in vsnprintfW. --- libs/wine/string.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 3c41019..6afb899 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -406,6 +406,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) sprintf(buffiter, "%d", fieldlen); while (*buffiter) *fmta++ = *buffiter++; + iter++; } else while (isdigit(*iter))

1 0

Huw Davies : include: Add rstloc.idl.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 4eeee2909a22f845ac10f8fcb844f7f86c8484bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eeee2909a22f845ac10f8fcb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:18:54 2009 +0000 include: Add rstloc.idl. --- include/Makefile.in | 1 + include/oledb.idl | 3 ++ include/rstloc.idl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 66d8c0d..f8fbfc9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -404,6 +404,7 @@ SRCDIR_INCLUDES = \ rpcproxy.h \ rstbas.idl \ rstinf.idl \ + rstloc.idl \ rtutils.h \ scarderr.h \ schannel.h \ diff --git a/include/oledb.idl b/include/oledb.idl index a1b4643..3f524eb 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -34,16 +34,19 @@ typedef LONG DBROWCOUNT; typedef ULONG DBCOUNTITEM; typedef ULONG DBLENGTH; typedef ULONG DBORDINAL; +typedef ULONG DBBKMARK; typedef DWORD DB_DWRESERVE; typedef ULONG DBREFCOUNT; typedef ULONG DB_UPARAMS; typedef LONG DB_LPARAMS; +typedef DWORD DBHASHVALUE; #include "dbs.idl" #include "access.idl" #include "rstbas.idl" #include "rstinf.idl" +#include "rstloc.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "dbccmd.idl" diff --git a/include/rstloc.idl b/include/rstloc.idl new file mode 100644 index 0000000..266aabf --- /dev/null +++ b/include/rstloc.idl @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + local, + object, + uuid(0c733a7d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetLocate : IRowset +{ + typedef DWORD DBCOMPARE; + + enum DBCOMPAREENUM + { + DBCOMPARE_LT, + DBCOMPARE_EQ, + DBCOMPARE_GT, + DBCOMPARE_NE, + DBCOMPARE_NOTCOMPARABLE + }; + + HRESULT Compare([in] HCHAPTER hReserved, + [in] DBBKMARK cbBookmark1, + [in, size_is(cbBookmark1)] const BYTE *pBookmark1, + [in] DBBKMARK cbBookmark2, + [in, size_is(cbBookmark2)] const BYTE *pBookmark2, + [out] DBCOMPARE *pComparison); + + HRESULT GetRowsAt([in] HWATCHREGION hReserved1, + [in] HCHAPTER hReserved2, + [in] DBBKMARK cbBookmark, + [in, size_is(cbBookmark)] const BYTE *pBookmark, + [in] DBROWOFFSET lRowsOffset, + [in] DBROWCOUNT cRows, + [out] DBCOUNTITEM *pcRowsObtained, + [out, size_is(,cRows)] HROW **prghRows); + + HRESULT GetRowsByBookmark([in] HCHAPTER hReserved, + [in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cRows)] const BYTE *rgpBookmarks[], + [out, size_is(cRows)] HROW rghRows[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT Hash([in] HCHAPTER hReserved, + [in] DBBKMARK cBookmarks, + [in, size_is(cBookmarks)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cBookmarks)] const BYTE *rgpBookmarks[], + [out, size_is(cBookmarks)] DBHASHVALUE rgHashedValues[], + [out, size_is(cBookmarks)] DBROWSTATUS rgBookmarkStatus[]); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index dadb393..28c1e1c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -127,6 +127,7 @@ my %private_idl_headers = ( "opnrst.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, + "rstloc.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1,

1 0

Paul Vriens : comctl32/tests: Use A-functions.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 9bd6887372c1a6b72f0fe784f99da72005b64e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd6887372c1a6b72f0fe784f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 14:57:22 2009 +0100 comctl32/tests: Use A-functions. --- dlls/comctl32/tests/propsheet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a61fa0b..111482e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,7 +92,7 @@ static void test_title(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc; @@ -123,7 +123,7 @@ static void test_nopage(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc; @@ -190,7 +190,7 @@ static void test_disableowner(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = NULL; @@ -251,25 +251,25 @@ static void test_wiznavigation(void) memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); psp[0].dwSize = sizeof(PROPSHEETPAGEA); - psp[0].hInstance = GetModuleHandleW(NULL); + psp[0].hInstance = GetModuleHandleA(NULL); U(psp[0]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_INTRO); psp[0].pfnDlgProc = nav_page_proc; hpsp[0] = CreatePropertySheetPageA(&psp[0]); psp[1].dwSize = sizeof(PROPSHEETPAGEA); - psp[1].hInstance = GetModuleHandleW(NULL); + psp[1].hInstance = GetModuleHandleA(NULL); U(psp[1]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EDIT); psp[1].pfnDlgProc = nav_page_proc; hpsp[1] = CreatePropertySheetPageA(&psp[1]); psp[2].dwSize = sizeof(PROPSHEETPAGEA); - psp[2].hInstance = GetModuleHandleW(NULL); + psp[2].hInstance = GetModuleHandleA(NULL); U(psp[2]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_RADIO); psp[2].pfnDlgProc = nav_page_proc; hpsp[2] = CreatePropertySheetPageA(&psp[2]); psp[3].dwSize = sizeof(PROPSHEETPAGEA); - psp[3].hInstance = GetModuleHandleW(NULL); + psp[3].hInstance = GetModuleHandleA(NULL); U(psp[3]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EXIT); psp[3].pfnDlgProc = nav_page_proc; hpsp[3] = CreatePropertySheetPageA(&psp[3]); @@ -363,7 +363,7 @@ static void test_buttons(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc;

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_UI1.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: deb38f467d96448665768c5d42578108d55b1cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb38f467d96448665768c5d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 11:57:44 2009 +0000 oledb32: Add some conversions to DBTYPE_UI1. --- dlls/oledb32/convert.c | 26 +++++++++++++++++++++ dlls/oledb32/tests/convert.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6394204..594917d 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -285,6 +285,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_UI1: + { + BYTE *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI1FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarUI1FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarUI1FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI1FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI1FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI1FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI1FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI1FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI1FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI1FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: *d = *(BYTE*)src; hr = S_OK; break; + case DBTYPE_UI2: hr = VarUI1FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarUI1FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarUI1FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarUI1FromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> UI1\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_FILETIME: { FILETIME *d = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 4f9ca6b..ab78eff 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1183,6 +1183,55 @@ static void test_converttofiletime(void) IDataConvert_Release(convert); } +static void test_converttoui1(void) +{ + IDataConvert *convert; + HRESULT hr; + BYTE dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + dst = 0x12; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_UI1, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0, "got %08x\n", dst); + + dst = 0x12; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst == 0x12, "got %08x\n", dst); + + dst = 0x12; + src[0] = 0x43; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_UI1, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0x43, "got %08x\n", dst); + + dst = 0x12; + src[0] = 0xfe; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_UI1, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0xfe, "got %08x\n", dst); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1194,6 +1243,7 @@ START_TEST(convert) test_converttowstr(); test_converttobyrefwstr(); test_converttoguid(); + test_converttoui1(); test_converttofiletime(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_UI4;.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 39166ccab0633cd9b861dba4b244e2a4c0a86587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39166ccab0633cd9b861dba4b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:03:19 2009 +0000 oledb32: Add some conversions to DBTYPE_UI4;. --- dlls/oledb32/convert.c | 26 ++++++++++++++++++ dlls/oledb32/tests/convert.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 594917d..a03c9d8 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -311,6 +311,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_UI4: + { + DWORD *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI4FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarUI4FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarUI4FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI4FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI4FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI4FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI4FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI4FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI4FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI4FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarUI4FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarUI4FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: *d = *(DWORD*)src; hr = S_OK; break; + case DBTYPE_I8: hr = VarUI4FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarUI4FromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> UI1\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_FILETIME: { FILETIME *d = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index ab78eff..60df2e4 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1232,6 +1232,64 @@ static void test_converttoui1(void) IDataConvert_Release(convert); } +static void test_converttoui4(void) +{ + IDataConvert *convert; + HRESULT hr; + DWORD dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + dst = 0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_UI4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0, "got %08x\n", dst); + + dst = 0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst == 0x12345678, "got %08x\n", dst); + + dst = 0x12345678; + *(DWORD*)src = 0x87654321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0x87654321, "got %08x\n", dst); + + dst = 0x12345678; + *(signed short *)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_UI4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + + dst = 0x12345678; + *(signed short *)src = -1; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); +todo_wine + ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst == 0x12345678, "got %08x\n", dst); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1244,6 +1302,7 @@ START_TEST(convert) test_converttobyrefwstr(); test_converttoguid(); test_converttoui1(); + test_converttoui4(); test_converttofiletime(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_R4.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 0d3e83c1c810f89f618263e992fcda3e122b42f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3e83c1c810f89f618263e99… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:07:40 2009 +0000 oledb32: Add some conversions to DBTYPE_R4. --- dlls/oledb32/convert.c | 29 +++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a03c9d8..6f2ddd4 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -122,6 +122,7 @@ static int get_length(DBTYPE type) return 2; case DBTYPE_I4: case DBTYPE_UI4: + case DBTYPE_R4: return 4; case DBTYPE_I8: case DBTYPE_UI8: @@ -259,6 +260,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_R4: + { + FLOAT *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarR4FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarR4FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: *d = *(FLOAT*)src; hr = S_OK; break; + case DBTYPE_R8: hr = VarR4FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarR4FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarR4FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarR4FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarR4FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarR4FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarR4FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarR4FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarR4FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarR4FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarR4FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarR4FromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> R4\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_BSTR: { BSTR *d = dst; @@ -332,7 +359,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: *d = *(DWORD*)src; hr = S_OK; break; case DBTYPE_I8: hr = VarUI4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarUI4FromUI8(*(ULONGLONG*)src, d); break; - default: FIXME("Unimplemented conversion %04x -> UI1\n", src_type); return E_NOTIMPL; + default: FIXME("Unimplemented conversion %04x -> UI4\n", src_type); return E_NOTIMPL; } break; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 60df2e4..7166cfb 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1290,6 +1290,55 @@ todo_wine IDataConvert_Release(convert); } +static void test_converttor4(void) +{ + IDataConvert *convert; + HRESULT hr; + FLOAT dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + dst = 1.0; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_R4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 0.0, "got %f\n", dst); + + dst = 1.0; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_R4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst == 1.0, "got %f\n", dst); + + dst = 1.0; + *(signed int*)src = 12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_R4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 12345678.0, "got %f\n", dst); + + dst = 1.0; + *(FLOAT *)src = 10.0; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_R4, 0, &dst_len, 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(dst), "got %d\n", dst_len); + ok(dst == 10.0, "got %f\n", dst); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1303,6 +1352,7 @@ START_TEST(convert) test_converttoguid(); test_converttoui1(); test_converttoui4(); + test_converttor4(); test_converttofiletime(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_CY.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 21bbdb7157fabd5313abeb964b807d95582b0df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bbdb7157fabd5313abeb964… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:13:20 2009 +0000 oledb32: Add some conversions to DBTYPE_CY. --- dlls/oledb32/convert.c | 28 +++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6f2ddd4..7992819 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -127,6 +127,8 @@ static int get_length(DBTYPE type) case DBTYPE_I8: case DBTYPE_UI8: return 8; + case DBTYPE_CY: + return sizeof(CY); case DBTYPE_BSTR: return sizeof(BSTR); case DBTYPE_FILETIME: @@ -286,6 +288,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_CY: + { + CY *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: d->int64 = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarCyFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarCyFromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarCyFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarCyFromR8(*(double*)src, d); break; + case DBTYPE_CY: *d = *(CY*)src; hr = S_OK; break; + case DBTYPE_DATE: hr = VarCyFromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarCyFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarCyFromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarCyFromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarCyFromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarCyFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarCyFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarCyFromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarCyFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarCyFromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> CY\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_BSTR: { BSTR *d = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7166cfb..7290a9d 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1339,6 +1339,55 @@ static void test_converttor4(void) IDataConvert_Release(convert); } +static void test_converttocy(void) +{ + IDataConvert *convert; + HRESULT hr; + CY dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + dst.int64 = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_CY, 0, &dst_len, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 0, "didn't get 0\n"); + + dst.int64 = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_CY, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(CY), "got %d\n", dst_len); + ok(dst.int64 == 0xcc, "dst changed\n"); + + dst.int64 = 0xcc; + *(int*)src = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_CY, 0, &dst_len, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 12340000, "got %d\n", dst.s.Lo); + + dst.int64 = 0xcc; + ((CY*)src)->int64 = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_CY, 0, &dst_len, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 1234, "got %d\n", dst.s.Lo); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1354,5 +1403,6 @@ START_TEST(convert) test_converttoui4(); test_converttor4(); test_converttofiletime(); + test_converttocy(); OleUninitialize(); }

1 0