January 2019 - Wine-Commits

Zebediah Figura : d3d8/tests: Add a test for MultiplyTransform().
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: 1bd1d0cca3f07b7c0b2df75b8c69c95644bb8423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd1d0cca3f07b7c0b2df75b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 19:50:21 2019 -0600 d3d8/tests: Add a test for MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index adfeca8..99f9ae1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9208,6 +9208,118 @@ static void test_resource_access(void) DestroyWindow(window); } +static void test_multiply_transform(void) +{ + IDirect3DDevice8 *device; + D3DMATRIX ret_mat; + DWORD stateblock; + IDirect3D8 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static const D3DTRANSFORMSTATETYPE tests[] = + { + D3DTS_VIEW, + D3DTS_PROJECTION, + D3DTS_TEXTURE0, + D3DTS_TEXTURE1, + D3DTS_TEXTURE2, + D3DTS_TEXTURE3, + D3DTS_TEXTURE4, + D3DTS_TEXTURE5, + D3DTS_TEXTURE6, + D3DTS_TEXTURE7, + D3DTS_WORLDMATRIX(0), + D3DTS_WORLDMATRIX(1), + D3DTS_WORLDMATRIX(2), + D3DTS_WORLDMATRIX(3), + D3DTS_WORLDMATRIX(255), + }; + + static const D3DMATRIX mat1 = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat2 = + {{{ + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 2.0f, + }}}; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DDevice8_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + /* MultiplyTransform() goes directly into the primary stateblock. */ + + hr = IDirect3DDevice8_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); +todo_wine + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + IDirect3DDevice8_DeleteStateBlock(device, stateblock); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9321,6 +9433,7 @@ START_TEST(device) test_device_caps(); test_get_info(); test_resource_access(); + test_multiply_transform(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Zebediah Figura : d3d9/tests: Add a test for MultiplyTransform().
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: e3786e44bc88dcb4ab598e576b855ecb4bf16de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3786e44bc88dcb4ab598e57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 19:50:22 2019 -0600 d3d9/tests: Add a test for MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bc8d708..37cf8d9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13042,6 +13042,118 @@ static void test_resource_access(void) DestroyWindow(window); } +static void test_multiply_transform(void) +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DDevice9 *device; + D3DMATRIX ret_mat; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static const D3DTRANSFORMSTATETYPE tests[] = + { + D3DTS_VIEW, + D3DTS_PROJECTION, + D3DTS_TEXTURE0, + D3DTS_TEXTURE1, + D3DTS_TEXTURE2, + D3DTS_TEXTURE3, + D3DTS_TEXTURE4, + D3DTS_TEXTURE5, + D3DTS_TEXTURE6, + D3DTS_TEXTURE7, + D3DTS_WORLDMATRIX(0), + D3DTS_WORLDMATRIX(1), + D3DTS_WORLDMATRIX(2), + D3DTS_WORLDMATRIX(3), + D3DTS_WORLDMATRIX(255), + }; + + static const D3DMATRIX mat1 = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat2 = + {{{ + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 2.0f, + }}}; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DDevice9_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + /* MultiplyTransform() goes directly into the primary stateblock. */ + + hr = IDirect3DDevice9_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_MultiplyTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); +todo_wine + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); + + hr = IDirect3DStateBlock9_Capture(stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", i); + + IDirect3DStateBlock9_Release(stateblock); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13167,6 +13279,7 @@ START_TEST(device) test_stretch_rect(); test_device_caps(); test_resource_access(); + test_multiply_transform(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Jacek Caban : rpcrt4: Fix comment about HANDLE_PARAM_IS_RETURN.
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: 69ca517e6da6d59cc687fd8613b428ae3352b689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ca517e6da6d59cc687fd86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 12:23:28 2019 +0100 rpcrt4: Fix comment about HANDLE_PARAM_IS_RETURN. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index ebdb8c8..606513f 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -202,8 +202,8 @@ typedef struct _NDR_EHD_CONTEXT * NDR_CONTEXT_HANDLE_SERIALIZE = 0x02 * NDR_CONTEXT_HANDLE_NO_SERIALIZE = 0x04 * NDR_STRICT_CONTEXT_HANDLE = 0x08 + * HANDLE_PARAM_IS_RETURN = 0x10 * HANDLE_PARAM_IS_OUT = 0x20 - * HANDLE_PARAM_IS_RETURN = 0x21 * HANDLE_PARAM_IS_IN = 0x40 * HANDLE_PARAM_IS_VIA_PTR = 0x80 */

1 0

Jacek Caban : widl: Fix HANDLE_PARAM_IS_RETURN flag handling.
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: 7841a757434b34e10323af4a735fef514f7e4b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7841a757434b34e10323af4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 12:27:16 2019 +0100 widl: Fix HANDLE_PARAM_IS_RETURN flag handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 27ba60f..8058301 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3514,8 +3514,7 @@ static unsigned int write_contexthandle_tfs(FILE *file, print_file(file, 2, "0x%02x,\t/* FC_BIND_CONTEXT */\n", FC_BIND_CONTEXT); print_file(file, 2, "0x%x,\t/* Context flags: ", flags); - /* return and can't be null values overlap */ - if (((flags & 0x21) != 0x21) && (flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL)) + if (flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) print_file(file, 0, "can't be null, "); if (flags & NDR_CONTEXT_HANDLE_SERIALIZE) print_file(file, 0, "serialize, "); @@ -3523,10 +3522,10 @@ static unsigned int write_contexthandle_tfs(FILE *file, print_file(file, 0, "no serialize, "); if (flags & NDR_STRICT_CONTEXT_HANDLE) print_file(file, 0, "strict, "); - if ((flags & 0x21) == 0x20) - print_file(file, 0, "out, "); - if ((flags & 0x21) == 0x21) + if (flags & 0x10) print_file(file, 0, "return, "); + if (flags & 0x20) + print_file(file, 0, "out, "); if (flags & 0x40) print_file(file, 0, "in, "); if (flags & 0x80)

1 0

Zebediah Figura : msi/tests: Use check_record() in test_select_column_names().
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: d7879eaa99b45d9f1263cad5f7e3699450ec1557 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7879eaa99b45d9f1263cad5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 20:58:13 2019 -0600 msi/tests: Use check_record() in test_select_column_names(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 118 ++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 100 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4cdc14c..f63fb10 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8955,9 +8955,8 @@ static void test_embedded_nulls(void) static void test_select_column_names(void) { - MSIHANDLE hdb = 0, rec, rec2, view; - char buffer[32]; - UINT r, size; + MSIHANDLE hdb = 0, rec, view; + UINT r; DeleteFileA(msifile); @@ -9008,43 +9007,22 @@ static void test_select_column_names(void) r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec ); - ok( r == 1, "got %u\n", r ); - r = MsiViewGetColumnInfo( view, MSICOLINFO_NAMES, &rec2 ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec2 ); - ok( r == 1, "got %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec2, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - MsiCloseHandle( rec2 ); - r = MsiViewGetColumnInfo( view, MSICOLINFO_TYPES, &rec2 ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec2 ); - ok( r == 1, "got %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec2, 1, buffer, &size ); + check_record(rec, 1, ""); + MsiCloseHandle(rec); + + r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "f0" ), "got \"%s\"\n", buffer ); - MsiCloseHandle( rec2 ); + check_record(rec, 1, ""); + MsiCloseHandle(rec); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); + r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - MsiCloseHandle( rec ); + check_record(rec, 1, "f0"); + MsiCloseHandle(rec); r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); + check_record(rec, 1, ""); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); @@ -9062,22 +9040,12 @@ static void test_select_column_names(void) r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec ); - ok( r == 2, "got %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "1" ), "got \"%s\"\n", buffer ); + check_record(rec, 2, "1", ""); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 2, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); + check_record(rec, 2, "3", ""); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); @@ -9095,32 +9063,12 @@ static void test_select_column_names(void) r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec ); - ok( r == 2, "got %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 2, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "1" ), "got \"%s\"\n", buffer ); + check_record(rec, 2, "", "1"); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 2, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "3" ), "got \"%s\"\n", buffer ); + check_record(rec, 2, "", "3"); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); @@ -9138,42 +9086,12 @@ static void test_select_column_names(void) r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - r = MsiRecordGetFieldCount( rec ); - ok( r == 3, "got %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "1" ), "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 2, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 3, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "2" ), "got \"%s\"\n", buffer ); + check_record(rec, 3, "1", "", "2"); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec ); ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 1, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "3" ), "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 2, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !buffer[0], "got \"%s\"\n", buffer ); - size = sizeof(buffer); - memset( buffer, 0x55, sizeof(buffer) ); - r = MsiRecordGetStringA( rec, 3, buffer, &size ); - ok( r == ERROR_SUCCESS, "unexpected result: %u\n", r ); - ok( !lstrcmpA( buffer, "4" ), "got \"%s\"\n", buffer ); + check_record(rec, 3, "3", "", "4"); MsiCloseHandle( rec ); r = MsiViewFetch( view, &rec );

1 0

Zebediah Figura : msi/tests: Use check_record() in test_columnorder().
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: d2edcc9e24cf9919825dcd0480b3f22e25dc7115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2edcc9e24cf9919825dcd04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 20:58:11 2019 -0600 msi/tests: Use check_record() in test_columnorder(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 352 +++------------------------------------------------- 1 file changed, 20 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2edcc9e24cf9919825d…

1 0

Sven Baars : dmstyle/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: f3e3401a0a4fe51975b8ffc08a22d385852f4ef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e3401a0a4fe51975b8ffc0… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 22 21:35:15 2019 +0100 dmstyle/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 4c09d44..a94640d 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -487,6 +487,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_CHUNKNOTFOUND, "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + IStream_Release(stream); /* All desc chunks, DMUS_OBJ_CATEGORY not supported */ stream = gen_riff_stream(alldesc);

1 0

Sven Baars : dmusic/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: e2ac7d4d9b23818c1ac9ca965ac87ef76412d941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ac7d4d9b23818c1ac9ca96… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 22 23:31:24 2019 +0100 dmusic/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 19890d1..a4fbd4a 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -720,6 +720,7 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_NOTADLSCOL, "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr); + IStream_Release(stream); /* All desc chunks */ stream = gen_riff_stream(alldesc);

1 0

Jacek Caban : widl: Use public HANDLE_PARAM_IS_* flags.
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: 28389a06f78c79ff74a1601ce29faaad81f523b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28389a06f78c79ff74a1601c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 12:27:26 2019 +0100 widl: Use public HANDLE_PARAM_IS_* flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8058301..da657d3 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -451,14 +451,14 @@ static unsigned char get_contexthandle_flags( const type_t *iface, const attr_li if (is_ptr(type) && !is_attr( type->attrs, ATTR_CONTEXTHANDLE ) && !is_attr( attrs, ATTR_CONTEXTHANDLE )) - flags |= 0x80; + flags |= HANDLE_PARAM_IS_VIA_PTR; if (is_attr(attrs, ATTR_IN)) { - flags |= 0x40; + flags |= HANDLE_PARAM_IS_IN; if (!is_attr(attrs, ATTR_OUT)) flags |= NDR_CONTEXT_HANDLE_CANNOT_BE_NULL; } - if (is_attr(attrs, ATTR_OUT)) flags |= 0x20; + if (is_attr(attrs, ATTR_OUT)) flags |= HANDLE_PARAM_IS_OUT; return flags; } @@ -3522,13 +3522,13 @@ static unsigned int write_contexthandle_tfs(FILE *file, print_file(file, 0, "no serialize, "); if (flags & NDR_STRICT_CONTEXT_HANDLE) print_file(file, 0, "strict, "); - if (flags & 0x10) + if (flags & HANDLE_PARAM_IS_RETURN) print_file(file, 0, "return, "); - if (flags & 0x20) + if (flags & HANDLE_PARAM_IS_OUT) print_file(file, 0, "out, "); - if (flags & 0x40) + if (flags & HANDLE_PARAM_IS_IN) print_file(file, 0, "in, "); - if (flags & 0x80) + if (flags & HANDLE_PARAM_IS_VIA_PTR) print_file(file, 0, "via ptr, "); print_file(file, 0, "*/\n"); print_file(file, 2, "0x%x,\t/* rundown routine */\n", get_context_handle_offset( type ));

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_multiply_transform().
by Alexandre Julliard Jan. 23, 2019

Jan. 23, 2019

Module: wine Branch: master Commit: 7163fbba85b0f27f5bedb22291a6f53d2b507cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7163fbba85b0f27f5bedb222… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 19:50:24 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_multiply_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 1 - dlls/d3d9/tests/device.c | 1 - dlls/ddraw/tests/ddraw7.c | 1 - dlls/wined3d/device.c | 17 ++++++----------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 99f9ae1..5f8c0eb 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9295,7 +9295,6 @@ static void test_multiply_transform(void) hr = IDirect3DDevice8_GetTransform(device, tests[i], &ret_mat); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); -todo_wine ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 37cf8d9..896a730 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13129,7 +13129,6 @@ static void test_multiply_transform(void) hr = IDirect3DDevice9_GetTransform(device, tests[i], &ret_mat); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); -todo_wine ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); hr = IDirect3DStateBlock9_Capture(stateblock); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3c81846..9374edb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15397,7 +15397,6 @@ static void test_multiply_transform(void) hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); -todo_wine ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", i); hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d03a982..b5460c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1529,26 +1529,21 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device, void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { - const struct wined3d_matrix *mat; - struct wined3d_matrix temp; + struct wined3d_matrix *mat; TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); - /* Note: Using 'updateStateBlock' rather than 'stateblock' in the code - * below means it will be recorded in a state block change, but it - * works regardless where it is recorded. - * If this is found to be wrong, change to StateBlock. */ if (state > HIGHEST_TRANSFORMSTATE) { WARN("Unhandled transform state %#x.\n", state); return; } - mat = &device->update_state->transforms[state]; - multiply_matrix(&temp, mat, matrix); - - /* Apply change via set transform - will reapply to eg. lights this way. */ - wined3d_device_set_transform(device, state, &temp); + /* Tests show that stateblock recording is ignored; the change goes directly + * into the primary stateblock. */ + mat = &device->state.transforms[state]; + multiply_matrix(mat, mat, matrix); + wined3d_cs_emit_set_transform(device->cs, state, matrix); } /* Note lights are real special cases. Although the device caps state only

1 0