wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Jacek Caban : rpcrt4: Fix comment about HANDLE_PARAM_IS_RETURN.
by Alexandre Julliard 23 Jan '19

23 Jan '19

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 : mshtml.idl: Add IDOMCustomEvent declaration.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 0f6ab0e31ab4ecac65bea979178fdc800192aa44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f6ab0e31ab4ecac65bea979… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 12:22:35 2019 +0100 mshtml.idl: Add IDOMCustomEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 67d4835..01a2f5a 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4119,6 +4119,10 @@ #define DISPID_IDOMKEYBOARDEVENT_IE9_CHAR DISPID_DOMKEYBOARDEVENT+13 #define DISPID_IDOMKEYBOARDEVENT_LOCALE DISPID_DOMKEYBOARDEVENT+14 +/* IDOMCustomEvent */ +#define DISPID_IDOMCUSTOMEVENT_DETAIL DISPID_DOMCUSTOMEVENT+1 +#define DISPID_IDOMCUSTOMEVENT_INITCUSTOMEVENT DISPID_DOMCUSTOMEVENT+2 + /* IDOMMessageEvent */ #define DISPID_IDOMMESSAGEEVENT_DATA DISPID_DOMMESSAGEEVENT+1 #define DISPID_IDOMMESSAGEEVENT_ORIGIN DISPID_DOMMESSAGEEVENT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 800fe38..b92955c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23641,6 +23641,52 @@ methods: } /***************************************************************************** + * IDOMCustomEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305106de-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMCustomEvent : IDispatch +{ + [propget, id(DISPID_IDOMCUSTOMEVENT_DETAIL)] + HRESULT detail([out, retval] VARIANT *p); + + [id(DISPID_IDOMCUSTOMEVENT_INITCUSTOMEVENT)] + HRESULT initCustomEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT *detail); +} + +/***************************************************************************** + * DispDOMCustomEvent dispinterface + */ +[ + hidden, + uuid(3059007c-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMCustomEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMCUSTOMEVENT_DETAIL)] + VARIANT detail(); + + [id(DISPID_IDOMCUSTOMEVENT_INITCUSTOMEVENT)] + void initCustomEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT *detail); +} + +/***************************************************************************** * IDOMMessageEvent interface */ [

1 0

Jacek Caban : widl: Use public HANDLE_PARAM_IS_* flags.
by Alexandre Julliard 23 Jan '19

23 Jan '19

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

Jacek Caban : widl: Fix HANDLE_PARAM_IS_RETURN flag handling.
by Alexandre Julliard 23 Jan '19

23 Jan '19

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

Nikolay Sivov : d3d11: Implement d3d11_device_GetImmediateContext1().
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 9ede653d0dd1ae9db2bf8df13ae5ce99a36a7766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ede653d0dd1ae9db2bf8df1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 23 08:21:33 2019 +0300 d3d11: Implement d3d11_device_GetImmediateContext1(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46298 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 10 ++++++++-- dlls/d3d11/tests/d3d11.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index df754de..7ad3d9b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3648,9 +3648,15 @@ static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device2 *iface return 0; } -static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface, ID3D11DeviceContext1 **context) +static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface, + ID3D11DeviceContext1 **immediate_context) { - FIXME("iface %p, context %p stub!\n", iface, context); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + + TRACE("iface %p, immediate_context %p.\n", iface, immediate_context); + + *immediate_context = &device->immediate_context.ID3D11DeviceContext1_iface; + ID3D11DeviceContext1_AddRef(*immediate_context); } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3efba83..3c870c2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6439,12 +6439,7 @@ static void test_device_context_state(void) feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); - todo_wine ok(!!context, "Failed to get immediate context.\n"); - if (!context) - { - ID3D11Device1_Release(device); - return; - } + ok(!!context, "Failed to get immediate context.\n"); sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; @@ -6471,7 +6466,14 @@ static void test_device_context_state(void) feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); +todo_wine ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + if (FAILED(hr)) + { + ID3D11SamplerState_Release(sampler); + ID3D11Device1_Release(device); + return; + } refcount = get_refcount(context_state); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount);

1 0

Zebediah Figura : msi/tests: Use check_record() in test_join().
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 5eab4a59de5f77f3d747b0f3e9eadd2c45dc7cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eab4a59de5f77f3d747b0f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 20:58:14 2019 -0600 msi/tests: Use check_record() in test_join(). 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 | 284 ++++++---------------------------------------------- 1 file changed, 32 insertions(+), 252 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5eab4a59de5f77f3d747…

1 0

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

23 Jan '19

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_dbmerge().
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 2ea8d809e9d2bc575abc3beb5b7c0de99e20f9f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ea8d809e9d2bc575abc3beb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 20:58:12 2019 -0600 msi/tests: Use check_record() in test_dbmerge(). 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 | 86 ++++++----------------------------------------------- 1 file changed, 9 insertions(+), 77 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 04b1a92..4cdc14c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8170,15 +8170,7 @@ static void test_dbmerge(void) query = "SELECT * FROM `MergeErrors`"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 1, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "One"), "Expected \"One\", got \"%s\"\n", buf); - - r = MsiRecordGetInteger(hrec, 2); - ok(r == 2, "Expected 2, got %d\n", r); - + check_record(hrec, 2, "One", "2"); MsiCloseHandle(hrec); r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `MergeErrors`", &hview); @@ -8186,34 +8178,14 @@ static void test_dbmerge(void) r = MsiViewGetColumnInfo(hview, MSICOLINFO_NAMES, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 1, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "Table"), "Expected \"Table\", got \"%s\"\n", buf); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "NumRowMergeConflicts"), - "Expected \"NumRowMergeConflicts\", got \"%s\"\n", buf); - + check_record(hrec, 2, "Table", "NumRowMergeConflicts"); MsiCloseHandle(hrec); r = MsiViewGetColumnInfo(hview, MSICOLINFO_TYPES, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 1, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "s255"), "Expected \"s255\", got \"%s\"\n", buf); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "i2"), "Expected \"i2\", got \"%s\"\n", buf); - + check_record(hrec, 2, "s255", "i2"); MsiCloseHandle(hrec); + MsiViewClose(hview); MsiCloseHandle(hview); @@ -8244,15 +8216,7 @@ static void test_dbmerge(void) query = "SELECT * FROM `One`"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - r = MsiRecordGetInteger(hrec, 1); - ok(r == 1, "Expected 1, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); - + check_record(hrec, 2, "1", "hi"); MsiCloseHandle(hrec); /* nothing in MergeErrors */ @@ -8290,15 +8254,7 @@ static void test_dbmerge(void) query = "SELECT * FROM `One`"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 1, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); - - r = MsiRecordGetInteger(hrec, 2); - ok(r == 1, "Expected 1, got %d\n", r); - + check_record(hrec, 2, "hi", "1"); MsiCloseHandle(hrec); /* nothing in MergeErrors */ @@ -8342,15 +8298,7 @@ static void test_dbmerge(void) query = "SELECT * FROM `One`"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - r = MsiRecordGetInteger(hrec, 1); - ok(r == 1, "Expected 1, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); - + check_record(hrec, 2, "1", "hi"); MsiCloseHandle(hrec); /* nothing in MergeErrors */ @@ -8444,28 +8392,12 @@ static void test_dbmerge(void) r = MsiViewFetch(hview, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - r = MsiRecordGetInteger(hrec, 1); - ok(r == 1, "Expected 1, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "foo"), "Expected \"foo\", got \"%s\"\n", buf); - + check_record(hrec, 2, "1", "foo"); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - - r = MsiRecordGetInteger(hrec, 1); - ok(r == 2, "Expected 2, got %d\n", r); - - size = MAX_PATH; - r = MsiRecordGetStringA(hrec, 2, buf, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); - + check_record(hrec, 2, "2", "bar"); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec);

1 0

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

23 Jan '19

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

Zebediah Figura : msi/tests: Introduce a variadic check_record() helper.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 7e083034d665fa8873c6d87a90d959f3351de7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e083034d665fa8873c6d87a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 20:58:10 2019 -0600 msi/tests: Introduce a variadic check_record() helper. 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 | 264 +++++++++++++++------------------------------------- 1 file changed, 73 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e083034d665fa8873c6…

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019