Module: wine Branch: master Commit: 98a2465abd7403b0f2581b09d9e113f73354f8b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a2465abd7403b0f2581b09d9...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Feb 22 03:04:38 2017 +0000
oledb32: Support converting to DBTYPE_BYREF | DBTYPE_STR in DataConvert.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/oledb32/convert.c | 24 +++++++++++ dlls/oledb32/tests/convert.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0a1518d..ac462f2 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -865,6 +865,30 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return hr; }
+ case DBTYPE_BYREF | DBTYPE_STR: + { + BSTR b; + char **d = dst; + DBLENGTH length; + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, + src, &b, sizeof(BSTR), src_status, dst_status, + precision, scale, flags); + if(hr != S_OK) return hr; + + length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); + *dst_len = length - 1; /* Doesn't include size for '\0' */ + *dst_status = DBSTATUS_S_OK; + *d = CoTaskMemAlloc(length); + + if(*d) + WideCharToMultiByte(CP_ACP, 0, b, -1, *d, length, NULL, NULL); + else + hr = E_OUTOFMEMORY; + SysFreeString(b); + + return hr; + } + case DBTYPE_VARIANT: { VARIANT *v = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index de852da..405e728 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2103,6 +2103,99 @@ static void test_converttobyrefwstr(void) ok(dst_len == 44, "got %ld\n", dst_len); }
+static void test_converttobyrefstr(void) +{ + HRESULT hr; + char *dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + BSTR b; + VARIANT v; + + VariantInit(&v); + + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_STR | DBTYPE_BYREF, 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 == 0, "got %ld\n", dst_len); + ok(dst[0] == 0, "got %04x\n", dst[0]); + CoTaskMemFree(dst); + + dst = (void*)0x12345678; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_STR | DBTYPE_BYREF, 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 == 0x1234, "got %ld\n", dst_len); + ok(dst == (void*)0x12345678, "got %p\n", dst); + + *(short *)src = 4321; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR | DBTYPE_BYREF, 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 == 4, "got %ld\n", dst_len); + ok(!lstrcmpA(dst, "4321"), "got %s\n", dst); + CoTaskMemFree(dst); + + *(short *)src = 4321; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR | DBTYPE_BYREF, 0, &dst_len, src, &dst, 0, 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 == 4, "got %ld\n", dst_len); + ok(!lstrcmpA(dst, "4321"), "got %s\n", dst); + CoTaskMemFree(dst); + + b = SysAllocString(ten); + *(BSTR *)src = b; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_STR | DBTYPE_BYREF, 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 == 2, "got %ld\n", dst_len); + ok(!lstrcmpA("10", dst), "got %s\n", dst); + CoTaskMemFree(dst); + SysFreeString(b); + + memcpy(src, ten, sizeof(ten)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR | DBTYPE_BYREF, 2, &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 == 1, "got %ld\n", dst_len); + ok(dst[0] == '1', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + CoTaskMemFree(dst); + + memcpy(src, ten, sizeof(ten)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR | DBTYPE_BYREF, 4, &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 == 2, "got %ld\n", dst_len); + ok(!lstrcmpA("10", dst), "got %s\n", dst); + CoTaskMemFree(dst); + + memcpy(src, ten, sizeof(ten)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR | DBTYPE_BYREF, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 2, "got %ld\n", dst_len); + ok(!lstrcmpA("10", dst), "got %s\n", dst); + CoTaskMemFree(dst); + + dst_len = 44; + V_VT(&v) = VT_NULL; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_STR | DBTYPE_BYREF, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 44, "got %ld\n", dst_len); +} + static void test_converttoguid(void) { HRESULT hr; @@ -3116,6 +3209,7 @@ START_TEST(convert) test_converttobstr(); test_converttowstr(); test_converttobyrefwstr(); + test_converttobyrefstr(); test_converttoguid(); test_converttoui1(); test_converttoui4();