January 2019 - Wine-commits

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_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

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

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

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 : 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 : 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

Paul Gofman : d3dx9: Factor out {lock|unlock}_surface() functions.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 33be8439fc95ca8f005bd3a2b6790c101842c02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=33be8439fc95ca8f005bd3a2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 14 21:45:08 2019 +0100 d3dx9: Factor out {lock|unlock}_surface() functions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 75 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 11a0ee1..2d00cd1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -199,6 +199,53 @@ static const struct { { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; +static HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 **temp_surface) +{ + IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + HRESULT hr; + + *temp_surface = NULL; + if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, NULL, D3DLOCK_READONLY))) + { + IDirect3DSurface9_GetDevice(surface, &device); + IDirect3DSurface9_GetDesc(surface, &desc); + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, desc.Width, desc.Height, + desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, temp_surface, NULL))) + { + IDirect3DDevice9_Release(device); + return hr; + } + + if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, NULL, *temp_surface, NULL, D3DTEXF_NONE))) + hr = IDirect3DSurface9_LockRect(*temp_surface, lock, NULL, D3DLOCK_READONLY); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to lock surface %p, usage %#x, pool %#x.\n", + surface, desc.Usage, desc.Pool); + IDirect3DSurface9_Release(*temp_surface); + *temp_surface = NULL; + return hr; + } + } + return hr; +} + +static HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 *temp_surface) +{ + HRESULT hr; + + if (!temp_surface) + return IDirect3DSurface9_UnlockRect(surface); + + hr = IDirect3DSurface9_UnlockRect(temp_surface); + IDirect3DSurface9_Release(temp_surface); + return hr; +} + static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { unsigned int i; @@ -1924,7 +1971,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - IDirect3DSurface9 *surface = src_surface; + IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; @@ -1979,32 +2026,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, src_rect = &s; } - if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) - { - IDirect3DSurface9_GetDevice(src_surface, &device); - if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, - src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL))) - { - IDirect3DDevice9_Release(device); - return D3DXERR_INVALIDDATA; - } - - if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) - hr = IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY); - IDirect3DDevice9_Release(device); - if (FAILED(hr)) - { - IDirect3DSurface9_Release(surface); - return D3DXERR_INVALIDDATA; - } - } + if (FAILED(lock_surface(src_surface, &lock, &temp_surface))) + return D3DXERR_INVALIDDATA; hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(surface); - if (surface != src_surface) - IDirect3DSurface9_Release(surface); + if (FAILED(unlock_surface(src_surface, &lock, temp_surface))) + return D3DXERR_INVALIDDATA; return hr; }

1 0

Paul Gofman : d3dx9: Use temporary surface in D3DXFillTexture() for unmappable textures.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 4e44d74afb12b40f673e3be0a91cd523013544cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e44d74afb12b40f673e3be0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 14 21:45:09 2019 +0100 d3dx9: Use temporary surface in D3DXFillTexture() for unmappable textures. Fixes a regression triggered by commit 949dbbd31f450178c90ea8267097a975b77c3219. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46453 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 4 ++ dlls/d3dx9_36/surface.c | 47 +++++++++++++------ dlls/d3dx9_36/tests/texture.c | 106 ++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/texture.c | 28 ++++++++--- 4 files changed, 134 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e44d74afb12b40f673e…

1 0

Paul Gofman : d3dx9/tests: Add test for D3DXFillVolumeTexture() with default pool texture.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 61e7e6ec1bf5d13d4cafa883ac74fe987c339740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e7e6ec1bf5d13d4cafa883… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 14 21:45:10 2019 +0100 d3dx9/tests: Add test for D3DXFillVolumeTexture() with default pool texture. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1a92a85..6c25a15 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1423,8 +1423,14 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) size = 4; hr = IDirect3DDevice9_CreateVolumeTexture(device, size, size, size, 0, 0, D3DFMT_A8R8G8B8, - D3DPOOL_MANAGED, &tex, NULL); + D3DPOOL_DEFAULT, &tex, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXFillVolumeTexture(tex, fillfunc_volume, NULL); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(tex); + hr = IDirect3DDevice9_CreateVolumeTexture(device, size, size, size, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, &tex, NULL); if (SUCCEEDED(hr)) { hr = D3DXFillVolumeTexture(tex, fillfunc_volume, NULL);

1 0