October 2009 - Wine-Commits

Huw Davies : oledb32: Add some conversions to DBTYPE_UI8.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: b3cdc6d7c85d0866902edb1f25ad7531fcc0988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cdc6d7c85d0866902edb1f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:17:53 2009 +0000 oledb32: Add some conversions to DBTYPE_UI8. --- 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 7992819..27ff585 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -392,6 +392,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_UI8: + { + ULONGLONG *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI8FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: {LONGLONG s = *(signed int*)src; hr = VarUI8FromI8(s, d); break;} + case DBTYPE_R4: hr = VarUI8FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI8FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI8FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI8FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI8FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI8FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI8FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarUI8FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarUI8FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarUI8FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarUI8FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: *d = *(ULONGLONG*)src; hr = S_OK; break; + default: FIXME("Unimplemented conversion %04x -> UI8\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 7290a9d..07b2d84 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1388,6 +1388,64 @@ static void test_converttocy(void) IDataConvert_Release(convert); } +static void test_converttoui8(void) +{ + IDataConvert *convert; + HRESULT hr; + ULARGE_INTEGER 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.QuadPart = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_UI8, 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.QuadPart == 0, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI8, 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.QuadPart == 0xcc, "dst changed\n"); + + dst.QuadPart = 0xcc; + *(int*)src = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 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.QuadPart == 1234, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + *(int*)src = -1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 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.QuadPart == 0xcc, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + ((ULARGE_INTEGER*)src)->QuadPart = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_UI8, 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.QuadPart == 1234, "got %d\n", (int)dst.QuadPart); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1404,5 +1462,6 @@ START_TEST(convert) test_converttor4(); test_converttofiletime(); test_converttocy(); + test_converttoui8(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_UI1.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

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 Oct. 28, 2009

Oct. 28, 2009

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 a few simple conversions to DBTYPE_GUID.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: 64a8eb601e719f25e827f73f3d554b689c67dac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a8eb601e719f25e827f73f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 11:49:21 2009 +0000 oledb32: Add a few simple conversions to DBTYPE_GUID. --- dlls/oledb32/convert.c | 14 +++++++++++++ dlls/oledb32/tests/convert.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 44d86bb..6394204 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -130,6 +130,8 @@ static int get_length(DBTYPE type) return sizeof(BSTR); case DBTYPE_FILETIME: return sizeof(FILETIME); + case DBTYPE_GUID: + return sizeof(GUID); case DBTYPE_WSTR: case DBTYPE_BYREF | DBTYPE_WSTR: return 0; @@ -295,6 +297,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_GUID: + { + GUID *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = GUID_NULL; hr = S_OK; break; + case DBTYPE_GUID: *d = *(GUID*)src; hr = S_OK; break; + default: FIXME("Unimplemented conversion %04x -> GUID\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_WSTR: { BSTR b; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 2095b9b..4f9ca6b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -35,6 +35,8 @@ #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static void test_dcinfo(void) { IDCInfo *info; @@ -1111,6 +1113,47 @@ static void test_converttobyrefwstr(void) IDataConvert_Release(convert); } +static void test_converttoguid(void) +{ + IDataConvert *convert; + HRESULT hr; + GUID 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 = IID_IDCInfo; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_GUID, 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(GUID), "got %d\n", dst_len); + ok(IsEqualGUID(&dst, &GUID_NULL), "didn't get GUID_NULL\n"); + + dst = IID_IDCInfo; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_GUID, 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(GUID), "got %d\n", dst_len); + ok(IsEqualGUID(&dst, &IID_IDCInfo), "dst has changed\n"); + + dst = IID_IDCInfo; + memcpy(src, &IID_IDataConvert, sizeof(GUID)); + hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_GUID, 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(GUID), "got %d\n", dst_len); + ok(IsEqualGUID(&dst, &IID_IDataConvert), "didn't get IID_IDataConvert\n"); + + IDataConvert_Release(convert); +} + static void test_converttofiletime(void) { IDataConvert *convert; @@ -1150,6 +1193,7 @@ START_TEST(convert) test_converttobstr(); test_converttowstr(); test_converttobyrefwstr(); + test_converttoguid(); test_converttofiletime(); OleUninitialize(); }

1 0

Jörg Höhle : mciwave: Default wave format is 11025x8x1.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: 0ac408f7fcd9774ec347558ff0c1ce9d85c60449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac408f7fcd9774ec347558ff… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 14:14:11 2009 +0200 mciwave: Default wave format is 11025x8x1. --- dlls/mciwave/mciwave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 7d2d186..d15603b 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -304,8 +304,8 @@ static DWORD WAVE_mciDefaultFmt(WINE_MCIWAVE* wmw) wmw->lpWaveFormat->wFormatTag = WAVE_FORMAT_PCM; wmw->lpWaveFormat->nChannels = 1; - wmw->lpWaveFormat->nSamplesPerSec = 44000; - wmw->lpWaveFormat->nAvgBytesPerSec = 44000; + wmw->lpWaveFormat->nSamplesPerSec = 11025; + wmw->lpWaveFormat->nAvgBytesPerSec = 11025; wmw->lpWaveFormat->nBlockAlign = 1; wmw->lpWaveFormat->wBitsPerSample = 8;

1 0

Jörg Höhle : mciwave: Fix wave format first, then compute position.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: 7f4d81ede7e2f06a2a0940f1548fc334dd8d4a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4d81ede7e2f06a2a0940f15… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 14:10:31 2009 +0200 mciwave: Fix wave format first, then compute position. nAvgBytesPerSec is the better factor in the presence of ADPCM, MPEG3 and other wave formats. --- dlls/mciwave/mciwave.c | 92 ++++++++++++++++++++++++++---------------------- 1 files changed, 50 insertions(+), 42 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 5270f25..7d2d186 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -216,8 +216,8 @@ static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD case MCI_FORMAT_BYTES: ret = val; break; - case MCI_FORMAT_SAMPLES: /* FIXME: is this correct ? */ - ret = (val * 8) / (wmw->lpWaveFormat->wBitsPerSample ? wmw->lpWaveFormat->wBitsPerSample : 1); + case MCI_FORMAT_SAMPLES: + ret = MulDiv(val,wmw->lpWaveFormat->nSamplesPerSec,wmw->lpWaveFormat->nAvgBytesPerSec); break; default: WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); @@ -236,13 +236,13 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) switch (wmw->dwMciTimeFormat) { case MCI_FORMAT_MILLISECONDS: - ret = (val * wmw->lpWaveFormat->nAvgBytesPerSec) / 1000; + ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,1000); break; case MCI_FORMAT_BYTES: ret = val; break; - case MCI_FORMAT_SAMPLES: /* FIXME: is this correct ? */ - ret = (val * wmw->lpWaveFormat->wBitsPerSample) / 8; + case MCI_FORMAT_SAMPLES: + ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,wmw->lpWaveFormat->nSamplesPerSec); break; default: WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); @@ -514,20 +514,26 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P dwRet = WAVE_mciDefaultFmt(wmw); if (dwRet == 0) { - if (wmw->lpWaveFormat) { - switch (wmw->lpWaveFormat->wFormatTag) { - case WAVE_FORMAT_PCM: - if (wmw->lpWaveFormat->nAvgBytesPerSec != - wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { - WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", - wmw->lpWaveFormat->nAvgBytesPerSec, - wmw->lpWaveFormat->nSamplesPerSec * - wmw->lpWaveFormat->nBlockAlign); - wmw->lpWaveFormat->nAvgBytesPerSec = - wmw->lpWaveFormat->nSamplesPerSec * - wmw->lpWaveFormat->nBlockAlign; - } - break; + if (wmw->lpWaveFormat->wFormatTag == WAVE_FORMAT_PCM) { + if (wmw->lpWaveFormat->nBlockAlign != + wmw->lpWaveFormat->nChannels * wmw->lpWaveFormat->wBitsPerSample/8) { + WARN("Incorrect nBlockAlign (%d), setting it to %d\n", + wmw->lpWaveFormat->nBlockAlign, + wmw->lpWaveFormat->nChannels * + wmw->lpWaveFormat->wBitsPerSample/8); + wmw->lpWaveFormat->nBlockAlign = + wmw->lpWaveFormat->nChannels * + wmw->lpWaveFormat->wBitsPerSample/8; + } + if (wmw->lpWaveFormat->nAvgBytesPerSec != + wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { + WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", + wmw->lpWaveFormat->nAvgBytesPerSec, + wmw->lpWaveFormat->nSamplesPerSec * + wmw->lpWaveFormat->nBlockAlign); + wmw->lpWaveFormat->nAvgBytesPerSec = + wmw->lpWaveFormat->nSamplesPerSec * + wmw->lpWaveFormat->nBlockAlign; } } wmw->dwPosition = 0; @@ -716,7 +722,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, LPMCI_PLAY_PARMS lpParms = (void*)pmt; DWORD end; LONG bufsize, count, left; - DWORD dwRet = 0; + DWORD dwRet; LPWAVEHDR waveHdr = NULL; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); int whidx; @@ -753,6 +759,30 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } + if (!wmw->lpWaveFormat) return MCIERR_WAVE_INPUTUNSPECIFIED; + if (wmw->lpWaveFormat->wFormatTag == WAVE_FORMAT_PCM) { + if (wmw->lpWaveFormat->nBlockAlign != + wmw->lpWaveFormat->nChannels * wmw->lpWaveFormat->wBitsPerSample/8) { + WARN("Incorrect nBlockAlign (%d), setting it to %d\n", + wmw->lpWaveFormat->nBlockAlign, + wmw->lpWaveFormat->nChannels * + wmw->lpWaveFormat->wBitsPerSample/8); + wmw->lpWaveFormat->nBlockAlign = + wmw->lpWaveFormat->nChannels * + wmw->lpWaveFormat->wBitsPerSample/8; + } + if (wmw->lpWaveFormat->nAvgBytesPerSec != + wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { + WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", + wmw->lpWaveFormat->nAvgBytesPerSec, + wmw->lpWaveFormat->nSamplesPerSec * + wmw->lpWaveFormat->nBlockAlign); + wmw->lpWaveFormat->nAvgBytesPerSec = + wmw->lpWaveFormat->nSamplesPerSec * + wmw->lpWaveFormat->nBlockAlign; + } + } + end = 0xFFFFFFFF; if (lpParms && (dwFlags & MCI_FROM)) { wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwFrom); @@ -773,28 +803,6 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, wmw->dwPosition = WAVE_ALIGN_ON_BLOCK(wmw, wmw->dwPosition); wmw->ckWaveData.cksize = WAVE_ALIGN_ON_BLOCK(wmw, wmw->ckWaveData.cksize); - if (dwRet == 0) { - if (wmw->lpWaveFormat) { - switch (wmw->lpWaveFormat->wFormatTag) { - case WAVE_FORMAT_PCM: - if (wmw->lpWaveFormat->nAvgBytesPerSec != - wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { - WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", - wmw->lpWaveFormat->nAvgBytesPerSec, - wmw->lpWaveFormat->nSamplesPerSec * - wmw->lpWaveFormat->nBlockAlign); - wmw->lpWaveFormat->nAvgBytesPerSec = - wmw->lpWaveFormat->nSamplesPerSec * - wmw->lpWaveFormat->nBlockAlign; - } - break; - } - } - } else { - TRACE("can't retrieve wave format %d\n", dwRet); - goto cleanUp; - } - /* go back to beginning of chunk plus the requested position */ /* FIXME: I'm not sure this is correct, notably because some data linked to

1 0

Rico Schüller : d3d10: Mark annotation variable as annotation.
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: b188cb132c6a245492f04c383e227708ce25e5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b188cb132c6a245492f04c383… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:14:27 2009 +0100 d3d10: Mark annotation variable as annotation. --- dlls/d3d10/effect.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 372982b..db66806 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -830,6 +830,9 @@ static HRESULT parse_fx10_annotation(struct d3d10_effect_variable *a, const char skip_dword_unknown(ptr, 1); + /* mark the variable as annotation */ + a->flag = D3D10_EFFECT_VARIABLE_ANNOTATION; + return S_OK; } @@ -2345,10 +2348,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria { desc->ExplicitBindPoint = This->buffer_offset; } - else if(This->flag) - { - FIXME("Unhandled flag %#x!\n", This->flag); - } return S_OK; }

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsShader().
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: ef07411ebfd00741013c761a2fb314a7ee4c7586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef07411ebfd00741013c761a2… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:13:49 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsShader(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 220ec51..372982b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2622,9 +2622,14 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variab static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShader( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl) + return (ID3D10EffectShaderVariable *)This; + + return (ID3D10EffectShaderVariable *)&null_shader_variable; } static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsBlend(ID3D10EffectVariable *iface)

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsSampler().
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: 4ef1031699b9915325f24caf3bff14e05084127b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef1031699b9915325f24caf3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:13:25 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsSampler(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8c59573..220ec51 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2668,9 +2668,14 @@ static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_va static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsSampler( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl) + return (ID3D10EffectSamplerVariable *)This; + + return (ID3D10EffectSamplerVariable *)&null_sampler_variable; } static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_SetRawValue(ID3D10EffectVariable *iface,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsRasterizer().
by Alexandre Julliard Oct. 28, 2009

Oct. 28, 2009

Module: wine Branch: master Commit: 3db6ec57ff113fac9bba6b6a1e1b63caa7835a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6ec57ff113fac9bba6b6a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:13:12 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsRasterizer(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b34df43..8c59573 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2655,9 +2655,14 @@ static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_ static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRasterizer( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl) + return (ID3D10EffectRasterizerVariable *)This; + + return (ID3D10EffectRasterizerVariable *)&null_rasterizer_variable; } static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsSampler(

1 0