April 2010 - Wine-Commits - list.winehq.org

Alex Villacís Lasso : oledb32: Implement conversion from DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 714283c9406365dbc6c0e3fd649794a1f6d5bc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714283c9406365dbc6c0e3fd6… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:45:57 2010 -0500 oledb32: Implement conversion from DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR. --- dlls/oledb32/convert.c | 20 ++++++++++++++++++++ dlls/oledb32/tests/convert.c | 34 ++++------------------------------ 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ce32a2a..6338090 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -352,6 +352,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = *d ? S_OK : E_OUTOFMEMORY; } break; + case DBTYPE_BYTES: + { + *d = SysAllocStringLen(NULL, 2 * src_len); + if (*d == NULL) + hr = E_OUTOFMEMORY; + else + { + const char hexchars[] = "0123456789ABCDEF"; + WCHAR *s = *d; + unsigned char *p = src; + while (src_len > 0) + { + *s++ = hexchars[(*p >> 4) & 0x0F]; + *s++ = hexchars[(*p) & 0x0F]; + src_len--; p++; + } + hr = S_OK; + } + } + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 77872b7..9cece28 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1286,82 +1286,68 @@ static void test_converttowstr(void) memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); ok(!lstrcmpW(hexunpacked_w, dst), "got %s\n", wine_dbgstr_w(dst)); - } ok(dst[sizeof(hexpacked_w)/sizeof(WCHAR) * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - } ok(dst_len == 0, "got %d\n", dst_len); - todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2 * sizeof(WCHAR) * 4, "got %d\n", dst_len); ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 ), "got %s\n", wine_dbgstr_w(dst)); ok(dst[2 * 4] == 0, "not null terminated\n"); - } ok(dst[2 * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4 + sizeof(WCHAR), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 ), "got %s\n", wine_dbgstr_w(dst)); ok(dst[2 * 4] == 0, "not null terminated\n"); - } ok(dst[2 * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4 +1, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 - 2 ), "got %s\n", wine_dbgstr_w(dst)); ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); - } ok(dst[2 * 4] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 - 2 ), "got %s\n", wine_dbgstr_w(dst)); ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); - } ok(dst[2 * 4] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - } ok(dst_len == 0, "got %d\n", dst_len); - todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); @@ -1768,70 +1754,58 @@ static void test_converttostr(void) memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); ok(!lstrcmpA(hexunpacked_a, dst), "got %s\n", dst); - } ok(dst[sizeof(hexpacked_a)/sizeof(char) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - } ok(dst_len == 0, "got %d\n", dst_len); - todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2 * sizeof(char) * 4, "got %d\n", dst_len); ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 ), "got %s\n", dst); ok(dst[2 * 4] == 0, "not null terminated\n"); - } ok(dst[2 * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, 2 * sizeof(char) * 4 + sizeof(char), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 ), "got %s\n", dst); ok(dst[2 * 4] == 0, "not null terminated\n"); - } ok(dst[2 * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, 2 * sizeof(char) * 4, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 - 2 ), "got %s\n", dst); ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); - } ok(dst[2 * 4] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - } ok(dst_len == 0, "got %d\n", dst_len); - todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == (char)0xcc, "clobbered buffer\n"); IDataConvert_Release(convert);

1 0

Stefan Leichter : setupapi: Implement SetupGetInfFileListA.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 05a308a80ba8acef2f25732d652a5ffd5361479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a308a80ba8acef2f25732d6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Apr 5 19:37:58 2010 +0200 setupapi: Implement SetupGetInfFileListA. --- dlls/setupapi/install.c | 34 ++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/install.c | 62 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 354f105..a71f274 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1463,6 +1463,40 @@ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DW /*********************************************************************** + * SetupGetInfFileListA (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfFileListA(PCSTR dir, DWORD style, PSTR buffer, + DWORD insize, PDWORD outsize) +{ + UNICODE_STRING dirW; + PWSTR bufferW = NULL; + BOOL ret = FALSE; + DWORD outsizeA, outsizeW; + + if ( dir ) + RtlCreateUnicodeStringFromAsciiz( &dirW, dir ); + else + dirW.Buffer = NULL; + + if ( buffer ) + bufferW = HeapAlloc( GetProcessHeap(), 0, insize * sizeof( WCHAR )); + + ret = SetupGetInfFileListW( dirW.Buffer, style, bufferW, insize, &outsizeW); + + if ( ret ) + { + outsizeA = WideCharToMultiByte( CP_ACP, 0, bufferW, outsizeW, + buffer, insize, NULL, NULL); + if ( outsize ) *outsize = outsizeA; + } + + HeapFree( GetProcessHeap(), 0, bufferW ); + RtlFreeUnicodeString( &dirW ); + return ret; +} + + +/*********************************************************************** * SetupGetInfFileListW (SETUPAPI.@) */ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5532aaa..1f77305 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -412,7 +412,7 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) -@ stub SetupGetInfFileListA +@ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stdcall SetupGetInfInformationW(ptr long ptr long ptr) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 668b2c2..f5df3df 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -53,6 +53,7 @@ static char CURR_DIR[MAX_PATH]; static void (WINAPI *pInstallHinfSectionA)(HWND, HINSTANCE, LPCSTR, INT); static void (WINAPI *pInstallHinfSectionW)(HWND, HINSTANCE, LPCWSTR, INT); +static BOOL (WINAPI *pSetupGetInfFileListA)(PCSTR, DWORD, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD); /* @@ -468,6 +469,65 @@ cleanup: DeleteFile(inffile); } +static void test_inffilelistA(void) +{ + static const char inffile2[] = "test2.inf"; + static const char *inf = + "[Version]\n" + "Signature=\"$Chicago$\""; + + char buffer[MAX_PATH] = { 0 }; + char dir[MAX_PATH], *p; + DWORD expected, outsize; + BOOL ret; + + if(!pSetupGetInfFileListA) + { + win_skip("SetupGetInfFileListA not present\n"); + return; + } + + /* create a private directory, the temp directory may contain some + * inf files left over from old installations + */ + if (!GetTempFileNameA(CURR_DIR, "inftest", 1, dir)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + if (!CreateDirectoryA(dir, NULL )) + { + win_skip("CreateDirectoryA(%s) failed with error %d\n", dir, GetLastError()); + return; + } + if (!SetCurrentDirectoryA(dir)) + { + win_skip("SetCurrentDirectoryA failed with error %d\n", GetLastError()); + RemoveDirectoryA(dir); + return; + } + + create_inf_file(inffile, inf); + create_inf_file(inffile2, inf); + + /* mixed style + */ + expected = 3 + strlen(inffile) + strlen(inffile2); + ret = pSetupGetInfFileListA(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListA to succeed!\n"); + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenA(p) && (outsize > (p - buffer)); p+=lstrlenA(p) + 1) + ok(!lstrcmpA(p,inffile2) || !lstrcmpA(p,inffile), + "unexpected filename %s\n",p); + + DeleteFile(inffile); + DeleteFile(inffile2); + SetCurrentDirectoryA(CURR_DIR); + RemoveDirectoryA(dir); +} + static void test_inffilelist(void) { static const char inffile2[] = "test2.inf"; @@ -656,6 +716,7 @@ START_TEST(install) pInstallHinfSectionA = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionA"); pInstallHinfSectionW = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionW"); + pSetupGetInfFileListA = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListA"); pSetupGetInfFileListW = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListW"); if (pInstallHinfSectionA) @@ -695,6 +756,7 @@ START_TEST(install) } test_inffilelist(); + test_inffilelistA(); SetCurrentDirectory(prev_path); }

1 0

Henri Verbeet : d3d8/tests: Clear with colors that are more obviously different from the expected value in test_rcp_rsq ().
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: ae623815ee963b330774939d2a9e550400d59720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae623815ee963b330774939d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 5 21:10:14 2010 +0200 d3d8/tests: Clear with colors that are more obviously different from the expected value in test_rcp_rsq(). --- dlls/d3d8/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1527176..dd4d372 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -576,7 +576,7 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) D3DVSD_END() }; - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff800080, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff336699, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); hr = IDirect3DDevice8_CreateVertexShader(device, decl, rcp_test, &shader, 0); @@ -606,7 +606,7 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) IDirect3DDevice8_SetVertexShader(device, 0); IDirect3DDevice8_DeleteVertexShader(device, shader); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff800080, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff996633, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); hr = IDirect3DDevice8_CreateVertexShader(device, decl, rsq_test, &shader, 0);

1 0

Henri Verbeet : wined3d: Capture the correct scissor rectangle.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: f41ee7cd0a066153c27667abbfcaaa92da135812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ee7cd0a066153c27667abb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 5 21:10:16 2010 +0200 wined3d: Capture the correct scissor rectangle. This bug was originally introduced by d4b63bbd87a221c725aff56b300224e55aa1f0a6, and then propagated by 1f029a30dbae7d40818d0d81bc84d15c93578c17. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48f9eac..028b79f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -757,7 +757,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) { TRACE("Updating scissor rect.\n"); - targetStateBlock->scissorRect = This->scissorRect; + This->scissorRect = targetStateBlock->scissorRect; } map = This->changed.streamSource;

1 0

Alex Villacís Lasso : oledb32: Implemented OLEDB32 conversion to DBTYPE_STR.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 5f236f1a5c25820f1a7d25c6664e96e2e054aae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f236f1a5c25820f1a7d25c66… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:39:08 2010 -0500 oledb32: Implemented OLEDB32 conversion to DBTYPE_STR. --- dlls/oledb32/convert.c | 32 ++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 32 +++----------------------------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 27ff585..4f2c303 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -136,6 +136,7 @@ static int get_length(DBTYPE type) case DBTYPE_GUID: return sizeof(GUID); case DBTYPE_WSTR: + case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: return 0; default: @@ -473,6 +474,37 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, SysFreeString(b); return hr; } + case DBTYPE_STR: + { + BSTR b; + DBLENGTH bstr_len; + INT bytes_to_copy; + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + src, &b, sizeof(BSTR), src_status, dst_status, + precision, scale, flags); + if(hr != S_OK) return hr; + bstr_len = SysStringLen(b); + *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ + *dst_status = DBSTATUS_S_OK; + bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); + if(dst) + { + if(bytes_to_copy >= sizeof(char)) + { + WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); + *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; + if(bytes_to_copy < *dst_len + sizeof(char)) + *dst_status = DBSTATUS_S_TRUNCATED; + } + else + { + *dst_status = DBSTATUS_E_DATAOVERFLOW; + hr = DB_E_ERRORSOCCURRED; + } + } + SysFreeString(b); + return hr; + } case DBTYPE_BYREF | DBTYPE_WSTR: { diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index e20d619..eb62e91 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1059,10 +1059,10 @@ static void test_converttostr(void) memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 0, "got %d\n", dst_len); - todo_wine ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[0] == 0, "got %02x\n", dst[0]); ok(dst[1] == (char)0xcc, "got %02x\n", dst[1]); memset(dst, 0xcc, sizeof(dst)); @@ -1074,60 +1074,49 @@ static void test_converttostr(void) *(short *)src = 4321; hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); - } *(short *)src = 4321; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); - } ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); *(short *)src = 4321; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, NULL, 0, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); - } ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); *(short *)src = 4321; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); ok(dst[0] == '4', "got %02x\n", dst[0]); ok(dst[1] == 0, "got %02x\n", dst[1]); - } ok(dst[2] == (char)0xcc, "got %02x\n", dst[2]); *(short *)src = 4321; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, dst, 1, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); ok(dst[0] == 0, "got %02x\n", dst[0]); - } ok(dst[1] == (char)0xcc, "got %02x\n", dst[1]); *(short *)src = 4321; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); @@ -1135,84 +1124,69 @@ static void test_converttostr(void) ok(dst[1] == '3', "got %02x\n", dst[1]); ok(dst[2] == '2', "got %02x\n", dst[2]); ok(dst[3] == 0, "got %02x\n", dst[3]); - } ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); b = SysAllocString(ten); *(BSTR *)src = b; memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); - } SysFreeString(b); memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR, 2, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 1, "got %d\n", dst_len); ok(dst[0] == '1', "got %02x\n", dst[0]); ok(dst[1] == 0, "got %02x\n", dst[1]); - } memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); - } memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); - } memcpy(src, ten_a, sizeof(ten_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 2, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2, "got %d\n", dst_len); ok(dst[0] == '1', "got %02x\n", dst[0]); ok(dst[1] == '0', "got %02x\n", dst[1]); ok(dst[2] == 0, "got %02x\n", dst[2]); - } ok(dst[3] == (char)0xcc, "got %02x\n", dst[3]); memcpy(src, ten_a, sizeof(ten_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 4, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); - } memcpy(src, ten_a, sizeof(ten_a)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 2, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); - } IDataConvert_Release(convert); }

1 0

Alex Villacís Lasso : oledb32: Add tests for DBTYPE_GUID to DBTYPE_WSTR/ DBTYPE_STR conversion as todo_wine.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 75c053aab54fe0f8e2d1fc211496edb8738e6889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c053aab54fe0f8e2d1fc211… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:44:03 2010 -0500 oledb32: Add tests for DBTYPE_GUID to DBTYPE_WSTR/DBTYPE_STR conversion as todo_wine. --- dlls/oledb32/tests/convert.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 69eb083..6f3ffd3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -923,6 +923,9 @@ static void test_converttowstr(void) DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; static const WCHAR fourthreetwoone[] = {'4','3','2','1',0}; + static const WCHAR guid_str[] = { + '{','0','C','7','3','3','A','8','D','-','2','A','1','C','-','1','1','C','E','-', + 'A','D','E','5','-','0','0','A','A','0','0','4','4','7','7','3','D','}',0}; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -1233,6 +1236,18 @@ static void test_converttowstr(void) + memset(src, 0, sizeof(src)); + memcpy(src, &IID_IDataConvert, sizeof(GUID)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 76, "got %d\n", dst_len); + ok(!lstrcmpW(dst, guid_str), "got %s\n", wine_dbgstr_w(dst)); + } + + b = SysAllocString(ten); *(BSTR *)src = b; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); @@ -1278,6 +1293,7 @@ static void test_converttostr(void) static const WCHAR ten[] = {'1','0',0}; static const char ten_a[] = "10"; static const char fourthreetwoone[] = "4321"; + static const char guid_str[] = "{0C733A8D-2A1C-11CE-ADE5-00AA0044773D}"; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -1585,6 +1601,18 @@ static void test_converttostr(void) + memset(src, 0, sizeof(src)); + memcpy(src, &IID_IDataConvert, sizeof(GUID)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_STR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 38, "got %d\n", dst_len); + ok(!lstrcmpA(dst, guid_str), "got %s\n", dst); + } + + b = SysAllocString(ten); *(BSTR *)src = b; memset(dst, 0xcc, sizeof(dst));

1 0

Alex Villacís Lasso : oledb32: Implement conversion from DBTYPE_GUID to DBTYPE_STR/DBTYPE_WSTR/ DBTYPE_BSTR.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: d1f4e6a149604fcaa282cd97aa7e557cc78bd4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f4e6a149604fcaa282cd97a… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:44:45 2010 -0500 oledb32: Implement conversion from DBTYPE_GUID to DBTYPE_STR/DBTYPE_WSTR/DBTYPE_BSTR. --- dlls/oledb32/convert.c | 16 ++++++++++++++++ dlls/oledb32/tests/convert.c | 6 ++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 4f2c303..ce32a2a 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -336,6 +336,22 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarBstrFromUI4(*(DWORD*)src, LOCALE_USER_DEFAULT, 0, d); break; case DBTYPE_I8: hr = VarBstrFromI8(*(LONGLONG*)src, LOCALE_USER_DEFAULT, 0, d); break; case DBTYPE_UI8: hr = VarBstrFromUI8(*(ULONGLONG*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_GUID: + { + WCHAR szBuff[39]; + const GUID *id = (const GUID *)src; + WCHAR format[] = { + '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0}; + wsprintfW(szBuff, format, + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + *d = SysAllocString(szBuff); + hr = *d ? S_OK : E_OUTOFMEMORY; + } + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6f3ffd3..e6da6de 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1240,12 +1240,11 @@ static void test_converttowstr(void) memcpy(src, &IID_IDataConvert, sizeof(GUID)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 76, "got %d\n", dst_len); ok(!lstrcmpW(dst, guid_str), "got %s\n", wine_dbgstr_w(dst)); - } + b = SysAllocString(ten); @@ -1605,12 +1604,11 @@ static void test_converttostr(void) memcpy(src, &IID_IDataConvert, sizeof(GUID)); memset(dst, 0xcc, sizeof(dst)); hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_STR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 38, "got %d\n", dst_len); ok(!lstrcmpA(dst, guid_str), "got %s\n", dst); - } + b = SysAllocString(ten);

1 0

Alex Villacís Lasso : oledb32: Add tests for DBTYPE_I4 to DBTYPE_WSTR/DBTYPE_STR conversion.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: cad15d3a7c519c89c9f8ef7c6ec9d3de825afd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad15d3a7c519c89c9f8ef7c6… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:39:49 2010 -0500 oledb32: Add tests for DBTYPE_I4 to DBTYPE_WSTR/DBTYPE_STR conversion. --- dlls/oledb32/tests/convert.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index eb62e91..f25288e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1002,6 +1002,64 @@ static void test_converttowstr(void) ok(dst[3] == 0, "got %02x\n", dst[3]); ok(dst[4] == 0xcccc, "got %02x\n", dst[4]); + + + *(int *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 0, &dst_len, src, NULL, 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 == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + ok(dst[2] == 0xcccc, "got %02x\n", dst[2]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == 0xcccc, "got %02x\n", dst[1]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_WSTR, 0, &dst_len, src, dst, 8, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == '3', "got %02x\n", dst[1]); + ok(dst[2] == '2', "got %02x\n", dst[2]); + ok(dst[3] == 0, "got %02x\n", dst[3]); + ok(dst[4] == 0xcccc, "got %02x\n", dst[4]); + + + b = SysAllocString(ten); *(BSTR *)src = b; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); @@ -1126,6 +1184,63 @@ static void test_converttostr(void) ok(dst[3] == 0, "got %02x\n", dst[3]); ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); + + *(int *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 0, &dst_len, src, NULL, 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 %d\n", dst_len); + ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + ok(dst[2] == (char)0xcc, "got %02x\n", dst[2]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 0, &dst_len, src, dst, 1, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == (char)0xcc, "got %02x\n", dst[1]); + + *(int *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_STR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == '3', "got %02x\n", dst[1]); + ok(dst[2] == '2', "got %02x\n", dst[2]); + ok(dst[3] == 0, "got %02x\n", dst[3]); + ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); + + + b = SysAllocString(ten); *(BSTR *)src = b; memset(dst, 0xcc, sizeof(dst));

1 0

Alex Villacís Lasso : oledb32: Add tests for DBTYPE_R8 to DBTYPE_WSTR/DBTYPE_STR conversion.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: a31d5c7025d99dcb05bec7acd56d44aefaa8565a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31d5c7025d99dcb05bec7acd… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:41:47 2010 -0500 oledb32: Add tests for DBTYPE_R8 to DBTYPE_WSTR/DBTYPE_STR conversion. --- dlls/oledb32/tests/convert.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 53b0402..f952bac 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1116,6 +1116,62 @@ static void test_converttowstr(void) + *(double *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 0, &dst_len, src, NULL, 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 == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + ok(dst[2] == 0xcccc, "got %02x\n", dst[2]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == 0xcccc, "got %02x\n", dst[1]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_WSTR, 0, &dst_len, src, dst, 8, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == '3', "got %02x\n", dst[1]); + ok(dst[2] == '2', "got %02x\n", dst[2]); + ok(dst[3] == 0, "got %02x\n", dst[3]); + ok(dst[4] == 0xcccc, "got %02x\n", dst[4]); + + + b = SysAllocString(ten); *(BSTR *)src = b; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); @@ -1351,6 +1407,61 @@ static void test_converttostr(void) ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); + *(double *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 0, &dst_len, src, NULL, 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 %d\n", dst_len); + ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + ok(dst[2] == (char)0xcc, "got %02x\n", dst[2]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 0, &dst_len, src, dst, 1, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == (char)0xcc, "got %02x\n", dst[1]); + + *(double *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_STR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == '3', "got %02x\n", dst[1]); + ok(dst[2] == '2', "got %02x\n", dst[2]); + ok(dst[3] == 0, "got %02x\n", dst[3]); + ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); + + b = SysAllocString(ten); *(BSTR *)src = b;

1 0

Alex Villacís Lasso : oledb32: Add tests for DBTYPE_I1/DBTYPE_UI1/DBTYPE_UI2/DBTYPE_UI4/DBTYPE_I8/ DBTYPE_UI8 to DBTYPE_WSTR/DBTYPE_STR conversion.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 38a21bf119a17758747ee830845e2cca078d27da URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a21bf119a17758747ee8308… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:43:24 2010 -0500 oledb32: Add tests for DBTYPE_I1/DBTYPE_UI1/DBTYPE_UI2/DBTYPE_UI4/DBTYPE_I8/DBTYPE_UI8 to DBTYPE_WSTR/DBTYPE_STR conversion. --- dlls/oledb32/tests/convert.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 9d2d473..69eb083 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1183,6 +1183,56 @@ static void test_converttowstr(void) + memset(src, 0, sizeof(src)); + *(signed char *)src = 10; + hr = IDataConvert_DataConvert(convert, DBTYPE_I1, DBTYPE_WSTR, 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 %d\n", dst_len); + ok(!lstrcmpW(dst, ten), "got %s\n", wine_dbgstr_w(dst)); + + memset(src, 0, sizeof(src)); + *(unsigned char *)src = 10; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_WSTR, 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 %d\n", dst_len); + ok(!lstrcmpW(dst, ten), "got %s\n", wine_dbgstr_w(dst)); + + memset(src, 0, sizeof(src)); + *(unsigned short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + memset(src, 0, sizeof(src)); + *(unsigned int *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + memset(src, 0, sizeof(src)); + ((LARGE_INTEGER*)src)->QuadPart = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + memset(src, 0, sizeof(src)); + ((ULARGE_INTEGER*)src)->QuadPart = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_WSTR, 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 == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + + b = SysAllocString(ten); *(BSTR *)src = b; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); @@ -1485,6 +1535,56 @@ static void test_converttostr(void) + memset(src, 0, sizeof(src)); + *(signed char *)src = 10; + hr = IDataConvert_DataConvert(convert, DBTYPE_I1, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, ten_a), "got %s\n", dst); + + memset(src, 0, sizeof(src)); + *(unsigned char *)src = 10; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, ten_a), "got %s\n", dst); + + memset(src, 0, sizeof(src)); + *(unsigned short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + memset(src, 0, sizeof(src)); + *(unsigned int *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + memset(src, 0, sizeof(src)); + ((LARGE_INTEGER*)src)->QuadPart = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + memset(src, 0, sizeof(src)); + ((ULARGE_INTEGER*)src)->QuadPart = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_STR, 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 %d\n", dst_len); + ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); + + + b = SysAllocString(ten); *(BSTR *)src = b; memset(dst, 0xcc, sizeof(dst));

1 0