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

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

April 6, 2010

Module: wine Branch: master Commit: 0d2b82fb621c23b94230e99735a80a2fd1e20003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2b82fb621c23b94230e9973… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:42:25 2010 -0500 oledb32: Add tests for DBTYPE_CY to DBTYPE_WSTR/DBTYPE_STR conversion. --- dlls/oledb32/tests/convert.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index f952bac..9d2d473 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1172,6 +1172,17 @@ static void test_converttowstr(void) + memset(src, 0, sizeof(src)); + ((CY*)src)->int64 = 43210000; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, 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); @@ -1463,6 +1474,17 @@ static void test_converttostr(void) + memset(src, 0, sizeof(src)); + ((CY*)src)->int64 = 43210000; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, 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

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

April 6, 2010

Module: wine Branch: master Commit: a817f6d0472f769999710f3d282c6c0524db9d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a817f6d0472f769999710f3d2… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:40:22 2010 -0500 oledb32: Add tests for DBTYPE_R4 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 f25288e..53b0402 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1060,6 +1060,62 @@ static void test_converttowstr(void) + *(float *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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)); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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); @@ -1240,6 +1296,61 @@ static void test_converttostr(void) ok(dst[4] == (char)0xcc, "got %02x\n", dst[4]); + *(float *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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]); + + *(float *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, 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: Tests for OLEDB32 conversion to DBTYPE_STR, marked as todo_wine.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: ac408708bc060418ad05cecf9de13caeb4882c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac408708bc060418ad05cecf9… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:38:16 2010 -0500 oledb32: Tests for OLEDB32 conversion to DBTYPE_STR, marked as todo_wine. --- dlls/oledb32/tests/convert.c | 182 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 182 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1f7ca08..e20d619 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1036,6 +1036,187 @@ static void test_converttowstr(void) IDataConvert_Release(convert); } +static void test_converttostr(void) +{ + IDataConvert *convert; + HRESULT hr; + char dst[100]; + BYTE src[64]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + static const char ten_a[] = "10"; + static const char fourthreetwoone[] = "4321"; + BSTR b; + + 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; + } + + + 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(dst_len == 0, "got %d\n", dst_len); + todo_wine ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == (char)0xcc, "got %02x\n", dst[1]); + + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_STR, 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 == 0, "got %d\n", dst_len); + ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); + + *(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); + 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)); + 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); +} + static void test_converttobyrefwstr(void) { IDataConvert *convert; @@ -1468,6 +1649,7 @@ START_TEST(convert) test_canconvert(); test_converttoi2(); test_converttoi4(); + test_converttostr(); test_converttobstr(); test_converttowstr(); test_converttobyrefwstr();

1 0

Alexandre Julliard : rpcrt4: Add support for complex arrays in the generic array unmarshalling functions .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: fe2f875aafea660527a10a81b1d06a44c9fc6f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f875aafea660527a10a81b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 22:02:20 2010 +0200 rpcrt4: Add support for complex arrays in the generic array unmarshalling functions. --- dlls/rpcrt4/ndr_marshall.c | 132 +++++++++++++++++++++++++++----------------- 1 files changed, 82 insertions(+), 50 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d28bf62..24c7dbc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -27,6 +27,7 @@ * - Checks for integer addition overflow in user marshall functions */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -2046,7 +2047,8 @@ static inline void array_write_variance_and_marshall( static inline ULONG array_read_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - DWORD esize; + DWORD def, esize; + unsigned char alignment; switch (fc) { @@ -2070,6 +2072,21 @@ static inline ULONG array_read_conformance( else ReadConformance(pStubMsg, NULL); return safe_multiply(esize, pStubMsg->MaxCount); + case RPC_FC_BOGUS_ARRAY: + alignment = pFormat[1] + 1; + def = *(const WORD *)(pFormat + 2); + pFormat += 4; + if (IsConformanceOrVariancePresent(pFormat)) pFormat = ReadConformance(pStubMsg, pFormat); + else + { + pStubMsg->MaxCount = def; + pFormat = SkipConformance( pStubMsg, pFormat ); + } + pFormat = SkipVariance( pStubMsg, pFormat ); + + align_pointer(&pStubMsg->Buffer, alignment); + esize = ComplexStructSize(pStubMsg, pFormat); + return safe_multiply(pStubMsg->MaxCount, esize); default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -2084,8 +2101,8 @@ static inline ULONG array_read_variance_and_unmarshall( ULONG bufsize, memsize; WORD esize; unsigned char alignment; - unsigned char *saved_buffer; - ULONG offset; + unsigned char *saved_buffer, *pMemory; + ULONG i, offset, count; switch (fc) { @@ -2204,6 +2221,31 @@ static inline ULONG array_read_variance_and_unmarshall( TRACE("string=%s\n", debugstr_w((LPWSTR)*ppMemory)); } return bufsize; + + case RPC_FC_BOGUS_ARRAY: + alignment = pFormat[1] + 1; + pFormat = SkipConformance(pStubMsg, pFormat + 4); + pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); + + esize = ComplexStructSize(pStubMsg, pFormat); + memsize = safe_multiply(esize, pStubMsg->MaxCount); + + assert( fUnmarshall ); + + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) + *ppMemory = NdrAllocate(pStubMsg, memsize); + + align_pointer(&pStubMsg->Buffer, alignment); + saved_buffer = pStubMsg->Buffer; + + pMemory = *ppMemory; + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) + pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); + return pStubMsg->Buffer - saved_buffer; + default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -2214,6 +2256,7 @@ static inline void array_memory_size( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, unsigned char fHasPointers) { + ULONG i, count, SavedMemorySize; ULONG bufsize, memsize; DWORD esize; unsigned char alignment; @@ -2286,6 +2329,24 @@ static inline void array_memory_size( safe_buffer_increment(pStubMsg, bufsize); pStubMsg->MemorySize += memsize; break; + case RPC_FC_BOGUS_ARRAY: + alignment = pFormat[1] + 1; + pFormat = SkipConformance(pStubMsg, pFormat + 4); + pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); + + align_pointer(&pStubMsg->Buffer, alignment); + + SavedMemorySize = pStubMsg->MemorySize; + + esize = ComplexStructSize(pStubMsg, pFormat); + memsize = safe_multiply(pStubMsg->MaxCount, esize); + + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) + ComplexStructMemorySize(pStubMsg, pFormat, NULL); + + pStubMsg->MemorySize = SavedMemorySize + memsize; + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -2296,6 +2357,8 @@ static inline void array_free( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, unsigned char fHasPointers) { + DWORD i, count; + switch (fc) { case RPC_FC_CARRAY: @@ -2313,6 +2376,15 @@ static inline void array_free( case RPC_FC_C_WSTRING: /* No embedded pointers so nothing to do */ break; + case RPC_FC_BOGUS_ARRAY: + count = *(const WORD *)(pFormat + 2); + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat + 4, count); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) + pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -4048,9 +4120,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG i, count, size; - unsigned char alignment; - unsigned char *pMemory; + ULONG size; unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; int saved_ignore_embedded; @@ -4064,8 +4134,6 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } - alignment = pFormat[1] + 1; - saved_ignore_embedded = pStubMsg->IgnoreEmbeddedPointers; /* save buffer pointer */ saved_buffer = pStubMsg->Buffer; @@ -4087,22 +4155,9 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* restore the original buffer */ pStubMsg->Buffer = saved_buffer; - pFormat += 4; - - pFormat = ReadConformance(pStubMsg, pFormat); - pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); - - if (!fMustAlloc && !*ppMemory) - fMustAlloc = TRUE; - if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, size); - - align_pointer(&pStubMsg->Buffer, alignment); - - pMemory = *ppMemory; - count = pStubMsg->ActualCount; - for (i = 0; i < count; i++) - pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); + array_read_conformance(RPC_FC_BOGUS_ARRAY, pStubMsg, pFormat); + array_read_variance_and_unmarshall(RPC_FC_BOGUS_ARRAY, pStubMsg, ppMemory, pFormat, fMustAlloc, + TRUE /* fUseBufferMemoryServer */, TRUE /* fUnmarshall */); if (pointer_buffer_mark_set) { @@ -4174,9 +4229,6 @@ void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - ULONG i, count, esize, SavedMemorySize, MemorySize; - unsigned char alignment; - TRACE("(%p,%p)\n", pStubMsg, pFormat); if (pFormat[0] != RPC_FC_BOGUS_ARRAY) @@ -4186,29 +4238,9 @@ ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, return 0; } - alignment = pFormat[1] + 1; - - pFormat += 4; - - pFormat = ReadConformance(pStubMsg, pFormat); - pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); - - align_pointer(&pStubMsg->Buffer, alignment); - - SavedMemorySize = pStubMsg->MemorySize; - - esize = ComplexStructSize(pStubMsg, pFormat); - - MemorySize = safe_multiply(pStubMsg->MaxCount, esize); - - count = pStubMsg->ActualCount; - for (i = 0; i < count; i++) - ComplexStructMemorySize(pStubMsg, pFormat, NULL); - - pStubMsg->MemorySize = SavedMemorySize; - - pStubMsg->MemorySize += MemorySize; - return MemorySize; + array_read_conformance(RPC_FC_BOGUS_ARRAY, pStubMsg, pFormat); + array_memory_size(RPC_FC_BOGUS_ARRAY, pStubMsg, pFormat, TRUE /* fHasPointers */); + return pStubMsg->MemorySize; } /***********************************************************************

1 0

Alexandre Julliard : rpcrt4: Add support for complex arrays in the generic array marshalling functions.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 3243ee7e0b2703619944535a0eef5f1163863a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3243ee7e0b2703619944535a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 22:01:46 2010 +0200 rpcrt4: Add support for complex arrays in the generic array marshalling functions. --- dlls/rpcrt4/ndr_marshall.c | 121 ++++++++++++++++++++++++++------------------ 1 files changed, 72 insertions(+), 49 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 80020ee..d28bf62 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -139,6 +139,27 @@ static void WINAPI NdrRangeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STR static ULONG WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer); +static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer); +static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer, + unsigned char fMustAlloc); +static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer); +static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat, + PFORMAT_STRING pPointer); + const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, @@ -1777,6 +1798,8 @@ static inline void array_compute_and_size_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { + DWORD count; + switch (fc) { case RPC_FC_CARRAY: @@ -1808,6 +1831,13 @@ static inline void array_compute_and_size_conformance( SizeConformance(pStubMsg); break; + case RPC_FC_BOGUS_ARRAY: + count = *(const WORD *)(pFormat + 2); + pFormat += 4; + if (IsConformanceOrVariancePresent(pFormat)) SizeConformance(pStubMsg); + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, count); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -1818,7 +1848,7 @@ static inline void array_buffer_size( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, unsigned char fHasPointers) { - DWORD size; + DWORD i, size; DWORD esize; unsigned char alignment; @@ -1868,6 +1898,18 @@ static inline void array_buffer_size( size = safe_multiply(esize, pStubMsg->ActualCount); safe_buffer_length_increment(pStubMsg, size); break; + case RPC_FC_BOGUS_ARRAY: + alignment = pFormat[1] + 1; + pFormat = SkipConformance(pStubMsg, pFormat + 4); + if (IsConformanceOrVariancePresent(pFormat)) SizeVariance(pStubMsg); + pFormat = SkipVariance(pStubMsg, pFormat); + + align_length(&pStubMsg->BufferLength, alignment); + + size = pStubMsg->ActualCount; + for (i = 0; i < size; i++) + pMemory = ComplexBufferSize(pStubMsg, pMemory, pFormat, NULL); + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -1878,6 +1920,9 @@ static inline void array_compute_and_write_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { + ULONG def; + BOOL conformance_present; + switch (fc) { case RPC_FC_CARRAY: @@ -1908,6 +1953,14 @@ static inline void array_compute_and_write_conformance( pStubMsg->Offset = 0; WriteConformance(pStubMsg); break; + case RPC_FC_BOGUS_ARRAY: + def = *(const WORD *)(pFormat + 2); + pFormat += 4; + conformance_present = IsConformanceOrVariancePresent(pFormat); + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + if (conformance_present) WriteConformance(pStubMsg); + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -1918,7 +1971,7 @@ static inline void array_write_variance_and_marshall( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, unsigned char fHasPointers) { - DWORD size; + DWORD i, size; DWORD esize; unsigned char alignment; @@ -1972,6 +2025,18 @@ static inline void array_write_variance_and_marshall( size = safe_multiply(esize, pStubMsg->ActualCount); safe_copy_to_buffer(pStubMsg, pMemory, size); /* the string itself */ break; + case RPC_FC_BOGUS_ARRAY: + alignment = pFormat[1] + 1; + pFormat = SkipConformance(pStubMsg, pFormat + 4); + if (IsConformanceOrVariancePresent(pFormat)) WriteVariance(pStubMsg); + pFormat = SkipVariance(pStubMsg, pFormat); + + align_pointer_clear(&pStubMsg->Buffer, alignment); + + size = pStubMsg->ActualCount; + for (i = 0; i < size; i++) + pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, NULL); + break; default: ERR("unknown array format 0x%x\n", fc); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -3920,9 +3985,6 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - ULONG i, count, def; - BOOL variance_present; - unsigned char alignment; int pointer_buffer_mark_set = 0; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -3934,8 +3996,6 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } - alignment = pFormat[1] + 1; - if (!pStubMsg->PointerBufferMark) { /* save buffer fields that may be changed by buffer sizer functions @@ -3965,25 +4025,9 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferLength = saved_buffer_length; } - def = *(const WORD*)&pFormat[2]; - pFormat += 4; - - pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - - variance_present = IsConformanceOrVariancePresent(pFormat); - pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); - TRACE("variance = %d\n", pStubMsg->ActualCount); - - WriteConformance(pStubMsg); - if (variance_present) - WriteVariance(pStubMsg); - - align_pointer_clear(&pStubMsg->Buffer, alignment); - - count = pStubMsg->ActualCount; - for (i = 0; i < count; i++) - pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, NULL); + array_compute_and_write_conformance(RPC_FC_BOGUS_ARRAY, pStubMsg, pMemory, pFormat); + array_write_variance_and_marshall(RPC_FC_BOGUS_ARRAY, pStubMsg, + pMemory, pFormat, TRUE /* fHasPointers */); STD_OVERFLOW_CHECK(pStubMsg); @@ -4076,9 +4120,6 @@ void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - ULONG i, count, def; - unsigned char alignment; - BOOL variance_present; int pointer_length_set = 0; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -4090,8 +4131,6 @@ void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, return; } - alignment = pFormat[1] + 1; - if (!pStubMsg->IgnoreEmbeddedPointers && !pStubMsg->PointerLength) { /* save buffer fields that may be changed by buffer sizer functions @@ -4118,25 +4157,9 @@ void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->MaxCount = saved_max_count; pStubMsg->BufferLength = saved_buffer_length; } - def = *(const WORD*)&pFormat[2]; - pFormat += 4; - - pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - SizeConformance(pStubMsg); - variance_present = IsConformanceOrVariancePresent(pFormat); - pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); - TRACE("variance = %d\n", pStubMsg->ActualCount); - - if (variance_present) - SizeVariance(pStubMsg); - - align_length(&pStubMsg->BufferLength, alignment); - - count = pStubMsg->ActualCount; - for (i = 0; i < count; i++) - pMemory = ComplexBufferSize(pStubMsg, pMemory, pFormat, NULL); + array_compute_and_size_conformance(RPC_FC_BOGUS_ARRAY, pStubMsg, pMemory, pFormat); + array_buffer_size(RPC_FC_BOGUS_ARRAY, pStubMsg, pMemory, pFormat, TRUE /* fHasPointers */); if(pointer_length_set) {

1 0

Alexandre Julliard : widl: Alignment for complex arrays and structs is the buffer alignment, not the memory one.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 1707c1c5cb6290560b16f4f6b2e5e8c09377d69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1707c1c5cb6290560b16f4f6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 20:05:05 2010 +0200 widl: Alignment for complex arrays and structs is the buffer alignment, not the memory one. --- tools/widl/typegen.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 102 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c3cfdc0..9e85fa0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1344,6 +1344,100 @@ unsigned int type_memsize(const type_t *t) return type_memsize_and_alignment( t, &align ); } +static unsigned int type_buffer_alignment(const type_t *t) +{ + const var_list_t *fields; + const var_t *var; + unsigned int max = 0, align; + + switch (type_get_type(t)) + { + case TYPE_BASIC: + switch (get_basic_fc(t)) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + return 1; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + return 2; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_FLOAT: + case RPC_FC_INT3264: + case RPC_FC_UINT3264: + return 4; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + return 8; + default: + error("type_buffer_alignment: Unknown type 0x%x\n", get_basic_fc(t)); + } + break; + case TYPE_ENUM: + switch (get_enum_fc(t)) + { + case RPC_FC_ENUM16: + return 2; + case RPC_FC_ENUM32: + return 4; + default: + error("type_buffer_alignment: Unknown enum type\n"); + } + break; + case TYPE_STRUCT: + if (!(fields = type_struct_get_fields(t))) break; + LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) + { + if (!var->type) continue; + align = type_buffer_alignment( var->type ); + if (max < align) max = align; + } + break; + case TYPE_ENCAPSULATED_UNION: + if (!(fields = type_encapsulated_union_get_fields(t))) break; + LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) + { + if (!var->type) continue; + align = type_buffer_alignment( var->type ); + if (max < align) max = align; + } + break; + case TYPE_UNION: + if (!(fields = type_union_get_cases(t))) break; + LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) + { + if (!var->type) continue; + align = type_buffer_alignment( var->type ); + if (max < align) max = align; + } + break; + case TYPE_ARRAY: + if (!type_array_is_decl_as_ptr(t)) + return type_buffer_alignment( type_array_get_element(t) ); + /* else fall through */ + case TYPE_POINTER: + return 4; + case TYPE_INTERFACE: + case TYPE_ALIAS: + case TYPE_VOID: + case TYPE_COCLASS: + case TYPE_MODULE: + case TYPE_FUNCTION: + case TYPE_BITFIELD: + /* these types should not be encountered here due to language + * restrictions (interface, void, coclass, module), logical + * restrictions (alias - due to type_get_type call above) or + * checking restrictions (function, bitfield). */ + assert(0); + } + return max; +} + int is_full_pointer_function(const var_t *func) { const var_t *var; @@ -1511,10 +1605,10 @@ static int user_type_has_variable_size(const type_t *t) static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { unsigned int start, absoff, flags; - unsigned int ualign = 0; const char *name = NULL; type_t *utype = get_user_type(type, &name); - unsigned int usize = type_memsize_and_alignment(utype, &ualign); + unsigned int usize = type_memsize(utype); + unsigned int ualign = type_buffer_alignment(utype); unsigned int size = type_memsize(type); unsigned short funoff = user_type_offset(name); short reloff; @@ -2168,7 +2262,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t { const expr_t *length_is = type_array_get_variance(type); const expr_t *size_is = type_array_get_conformance(type); - unsigned int align = 0; + unsigned int align; unsigned int size; unsigned int start_offset; unsigned char fc; @@ -2183,8 +2277,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); - align = 0; - size = type_memsize_and_alignment((is_conformant_array(type) ? type_array_get_element(type) : type), &align); + size = type_memsize(is_conformant_array(type) ? type_array_get_element(type) : type); + align = type_buffer_alignment(is_conformant_array(type) ? type_array_get_element(type) : type); fc = get_array_fc(type); start_offset = *typestring_offset; @@ -2359,7 +2453,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, const var_t *array; unsigned int start_offset; unsigned int array_offset; - unsigned int align = 0; + unsigned int align; unsigned int corroff; var_t *f; unsigned char fc = get_struct_fc(type); @@ -2368,7 +2462,8 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, guard_rec(type); current_structure = type; - total_size = type_memsize_and_alignment(type, &align); + total_size = type_memsize(type); + align = type_buffer_alignment(type); if (total_size > USHRT_MAX) error("structure size for %s exceeds %d bytes by %d bytes\n", name, USHRT_MAX, total_size - USHRT_MAX);

1 0

Alexandre Julliard : widl: Add a type_memsize_and_alignment function to make it explicit where the alignment is truly needed .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: cb6a2254819faea6a4cd5b7208688facbf94e92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6a2254819faea6a4cd5b720… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 19:48:07 2010 +0200 widl: Add a type_memsize_and_alignment function to make it explicit where the alignment is truly needed. --- tools/widl/expr.c | 6 +-- tools/widl/parser.y | 7 +-- tools/widl/typegen.c | 109 ++++++++++++++++++++----------------------------- tools/widl/typegen.h | 2 +- 4 files changed, 50 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb6a2254819faea6a4cd5…

1 0

Alexandre Julliard : rpcrt4: Fix tracing of non-conformant strings.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 5728d6b402c7f5697e82573f19313b9b2e30073d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5728d6b402c7f5697e82573f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 21:58:06 2010 +0200 rpcrt4: Fix tracing of non-conformant strings. --- dlls/rpcrt4/ndr_marshall.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ac72055..3b5a340 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2405,20 +2405,18 @@ unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM if (*pFormat == RPC_FC_CSTRING) { - ULONG i; + ULONG i = 0; const char *str = (const char *)pMemory; - for (i = 0; i < maxsize && *str; i++, str++) - ; + while (i < maxsize && str[i]) i++; TRACE("string=%s\n", debugstr_an(str, i)); pStubMsg->ActualCount = i + 1; esize = 1; } else if (*pFormat == RPC_FC_WSTRING) { - ULONG i; + ULONG i = 0; const WCHAR *str = (const WCHAR *)pMemory; - for (i = 0; i < maxsize && *str; i++, str++) - ; + while (i < maxsize && str[i]) i++; TRACE("string=%s\n", debugstr_wn(str, i)); pStubMsg->ActualCount = i + 1; esize = 2; @@ -2507,20 +2505,18 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, if (*pFormat == RPC_FC_CSTRING) { - ULONG i; + ULONG i = 0; const char *str = (const char *)pMemory; - for (i = 0; i < maxsize && *str; i++, str++) - ; + while (i < maxsize && str[i]) i++; TRACE("string=%s\n", debugstr_an(str, i)); pStubMsg->ActualCount = i + 1; esize = 1; } else if (*pFormat == RPC_FC_WSTRING) { - ULONG i; + ULONG i = 0; const WCHAR *str = (const WCHAR *)pMemory; - for (i = 0; i < maxsize && *str; i++, str++) - ; + while (i < maxsize && str[i]) i++; TRACE("string=%s\n", debugstr_wn(str, i)); pStubMsg->ActualCount = i + 1; esize = 2;

1 0

Alexandre Julliard : rpcrt4: Always skip the conformance format, even if conformance is not present in the buffer.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: c1a9dc8ad22a5ca8b977b111850ffc7a914315fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a9dc8ad22a5ca8b977b1118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 21:59:30 2010 +0200 rpcrt4: Always skip the conformance format, even if conformance is not present in the buffer. Add an identical SkipVariance function to make the code clearer. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3b5a340..80020ee 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -644,14 +644,16 @@ finish_conf: static inline PFORMAT_STRING SkipConformance(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - if (IsConformanceOrVariancePresent(pFormat)) - { if (pStubMsg->fHasNewCorrDesc) pFormat += 6; else pFormat += 4; - } - return pFormat; + return pFormat; +} + +static inline PFORMAT_STRING SkipVariance(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) +{ + return SkipConformance( pStubMsg, pFormat ); } /* multiply two numbers together, raising an RPC_S_INVALID_BOUND exception if @@ -1842,7 +1844,7 @@ static inline void array_buffer_size( alignment = pFormat[1] + 1; pFormat = SkipConformance(pStubMsg, pFormat + 4); - pFormat = SkipConformance(pStubMsg, pFormat); + pFormat = SkipVariance(pStubMsg, pFormat); SizeVariance(pStubMsg); @@ -1942,10 +1944,8 @@ static inline void array_write_variance_and_marshall( esize = *(const WORD*)(pFormat+2); alignment = pFormat[1] + 1; - /* conformance */ pFormat = SkipConformance(pStubMsg, pFormat + 4); - /* variance */ - pFormat = SkipConformance(pStubMsg, pFormat); + pFormat = SkipVariance(pStubMsg, pFormat); WriteVariance(pStubMsg);

1 0

Maarten Lankhorst : mmdevapi: Use openal to enumerate devices.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: 7b36f6658b3d221fb58cedcbc494a5da135f8207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b36f6658b3d221fb58cedcbc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:48:57 2010 +0100 mmdevapi: Use openal to enumerate devices. --- dlls/mmdevapi/devenum.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 62855fa..362855e 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -106,7 +106,7 @@ static HRESULT MMDevPropStore_Create(MMDevice *This, DWORD access, IPropertyStor * If GUID is null, a random guid will be assigned * and the device will be created */ -static void MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) +static void MMDevice_Create(MMDevice **dev, WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) { HKEY key, root; MMDevice *cur; @@ -190,6 +190,8 @@ done: else MMDevice_def_rec = cur; } + if (dev) + *dev = cur; } static void MMDevice_Destroy(MMDevice *This) @@ -679,6 +681,113 @@ HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY ke return hr; } +#ifdef HAVE_OPENAL + +static void openal_setformat(MMDevice *This, DWORD freq) +{ + HRESULT hr; + PROPVARIANT pv = { VT_EMPTY }; + + hr = MMDevice_GetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + if (SUCCEEDED(hr) && pv.vt == VT_BLOB) + { + WAVEFORMATEX *pwfx; + pwfx = (WAVEFORMATEX*)pv.u.blob.pBlobData; + if (pwfx->nSamplesPerSec != freq) + { + pwfx->nSamplesPerSec = freq; + pwfx->nAvgBytesPerSec = freq * pwfx->nBlockAlign; + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + } + CoTaskMemFree(pwfx); + } + else + { + WAVEFORMATEXTENSIBLE wfxe; + + wfxe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + wfxe.Format.nChannels = 2; + wfxe.Format.wBitsPerSample = 32; + wfxe.Format.nBlockAlign = wfxe.Format.nChannels * wfxe.Format.wBitsPerSample/8; + wfxe.Format.nSamplesPerSec = freq; + wfxe.Format.nAvgBytesPerSec = wfxe.Format.nSamplesPerSec * wfxe.Format.nBlockAlign; + wfxe.Format.cbSize = sizeof(wfxe)-sizeof(WAVEFORMATEX); + wfxe.Samples.wValidBitsPerSample = 32; + wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + wfxe.dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; + + pv.vt = VT_BLOB; + pv.u.blob.cbSize = sizeof(wfxe); + pv.u.blob.pBlobData = (BYTE*)&wfxe; + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_OEMFormat, &pv); + } +} + +static void openal_scanrender(void) +{ + WCHAR name[MAX_PATH]; + ALCdevice *dev; + const ALCchar *devstr, *defaultstr; + EnterCriticalSection(&openal_crst); + if (palcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT")) { + defaultstr = palcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER); + devstr = palcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER); + } else { + defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); + devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); + } + if (devstr && *devstr) + do { + MMDevice *mmdev; + MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, + name, sizeof(name)/sizeof(*name)-1 ); + name[sizeof(name)/sizeof(*name)-1] = 0; + TRACE("Adding %s\n", devstr); + dev = palcOpenDevice(devstr); + MMDevice_Create(&mmdev, name, NULL, eRender, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) + { + ALint freq = 44100; + palcGetIntegerv(dev, ALC_FREQUENCY, 1, &freq); + openal_setformat(mmdev, freq); + palcCloseDevice(dev); + } + else + WARN("Could not open device: %04x\n", palcGetError(NULL)); + devstr += strlen(devstr)+1; + } while (*devstr); + LeaveCriticalSection(&openal_crst); +} + +static void openal_scancapture(void) +{ + WCHAR name[MAX_PATH]; + ALCdevice *dev; + const ALCchar *devstr, *defaultstr; + + EnterCriticalSection(&openal_crst); + devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); + defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + if (devstr && *devstr) + do { + ALint freq = 44100; + MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, + name, sizeof(name)/sizeof(*name)-1 ); + name[sizeof(name)/sizeof(*name)-1] = 0; + TRACE("Adding %s\n", devstr); + dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); + MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) + palcCaptureCloseDevice(dev); + else + WARN("Could not open device: %04x\n", palcGetError(NULL)); + devstr += strlen(devstr)+1; + } while (*devstr); + LeaveCriticalSection(&openal_crst); +} +#endif /*HAVE_OPENAL*/ + HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; @@ -738,11 +847,18 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - MMDevice_Create(pv.u.pwszVal, &guid, curflow, + MMDevice_Create(NULL, pv.u.pwszVal, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); CoTaskMemFree(pv.u.pwszVal); } } while (1); +#ifdef HAVE_OPENAL + if (openal_loaded) + { + openal_scanrender(); + openal_scancapture(); + } +#endif /*HAVE_OPENAL*/ } return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); }

1 0