ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32/tests: Fix some failing tests on win98.

This commit is contained in:
Huw Davies 2009-11-04 11:23:18 +00:00 committed by Alexandre Julliard
parent f8376b91da
commit 0efdde1f42
2 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
dlls/oledb32/tests/convert.c
View File

@ -555,26 +555,31 @@ todo_wine
dst = 0x1234; dst = 0x1234;
((LARGE_INTEGER*)src)->QuadPart = 0x1234abcd; ((LARGE_INTEGER*)src)->QuadPart = 0x1234abcd;
hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(hr == DB_E_ERRORSOCCURRED ||
ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); broken(hr == DB_E_UNSUPPORTEDCONVERSION), /* win98 */
ok(dst_len == sizeof(dst), "got %d\n", dst_len); "got %08x\n", hr);
ok(dst == 0x1234, "got %08x\n", dst); if(hr != DB_E_UNSUPPORTEDCONVERSION) /* win98 doesn't support I8/UI8 */
{
ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %d\n", dst_len);
ok(dst == 0x1234, "got %08x\n", dst);
dst = 0x1234; dst = 0x1234;
((LARGE_INTEGER*)src)->QuadPart = 0x4321; ((LARGE_INTEGER*)src)->QuadPart = 0x4321;
hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %d\n", dst_len); ok(dst_len == sizeof(dst), "got %d\n", dst_len);
ok(dst == 0x4321, "got %08x\n", dst); ok(dst == 0x4321, "got %08x\n", dst);
dst = 0x1234; dst = 0x1234;
((ULARGE_INTEGER*)src)->QuadPart = 0x4321; ((ULARGE_INTEGER*)src)->QuadPart = 0x4321;
hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %d\n", dst_len); ok(dst_len == sizeof(dst), "got %d\n", dst_len);
ok(dst == 0x4321, "got %08x\n", dst); ok(dst == 0x4321, "got %08x\n", dst);
}
dst = 0x1234; dst = 0x1234;
strcpy((char *)src, "10"); strcpy((char *)src, "10");
@ -798,18 +803,23 @@ todo_wine
i4 = 0x12345678; i4 = 0x12345678;
((LARGE_INTEGER*)src)->QuadPart = 0x1234abcd; ((LARGE_INTEGER*)src)->QuadPart = 0x1234abcd;
hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK ||
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); broken(hr == DB_E_UNSUPPORTEDCONVERSION), /* win98 */
ok(dst_len == sizeof(i4), "got %d\n", dst_len); "got %08x\n", hr);
ok(i4 == 0x1234abcd, "got %08x\n", i4); if(hr != DB_E_UNSUPPORTEDCONVERSION) /* win98 doesn't support I8/UI8 */
{
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(i4), "got %d\n", dst_len);
ok(i4 == 0x1234abcd, "got %08x\n", i4);
i4 = 0x12345678; i4 = 0x12345678;
((ULARGE_INTEGER*)src)->QuadPart = 0x1234abcd; ((ULARGE_INTEGER*)src)->QuadPart = 0x1234abcd;
hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(i4), "got %d\n", dst_len); ok(dst_len == sizeof(i4), "got %d\n", dst_len);
ok(i4 == 0x1234abcd, "got %08x\n", i4); ok(i4 == 0x1234abcd, "got %08x\n", i4);
}
i4 = 0x12345678; i4 = 0x12345678;
strcpy((char *)src, "10"); strcpy((char *)src, "10");
@ -1174,11 +1184,16 @@ static void test_converttofiletime(void)
((FILETIME *)src)->dwLowDateTime = 0x12345678; ((FILETIME *)src)->dwLowDateTime = 0x12345678;
((FILETIME *)src)->dwHighDateTime = 0x9abcdef0; ((FILETIME *)src)->dwHighDateTime = 0x9abcdef0;
hr = IDataConvert_DataConvert(convert, DBTYPE_FILETIME, DBTYPE_FILETIME, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_FILETIME, DBTYPE_FILETIME, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK ||
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); broken(hr == DB_E_BADBINDINFO), /* win98 */
ok(dst_len == sizeof(dst), "got %d\n", dst_len); "got %08x\n", hr);
ok(dst.dwLowDateTime == 0x12345678, "got %08x\n", dst.dwLowDateTime); if(SUCCEEDED(hr))
ok(dst.dwHighDateTime == 0x9abcdef0, "got %08x\n", dst.dwHighDateTime); {
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %d\n", dst_len);
ok(dst.dwLowDateTime == 0x12345678, "got %08x\n", dst.dwLowDateTime);
ok(dst.dwHighDateTime == 0x9abcdef0, "got %08x\n", dst.dwHighDateTime);
}
IDataConvert_Release(convert); IDataConvert_Release(convert);
} }

2
include/oledberr.h
View File

@ -21,6 +21,8 @@
#ifndef __WINE_OLEDBERR_H #ifndef __WINE_OLEDBERR_H
#define __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H
#define DB_E_BADBINDINFO 0x80040e08
#define DB_E_NOTFOUND 0x80040e19 #define DB_E_NOTFOUND 0x80040e19
#define DB_E_UNSUPPORTEDCONVERSION 0x80040e1d #define DB_E_UNSUPPORTEDCONVERSION 0x80040e1d