June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Move NtGetContextThread() implementation to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 7c32b2dd9368137eca3cf0202360bbe0db62efbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c32b2dd9368137eca3cf020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 14:05:42 2020 +0200 ntdll: Move NtGetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 142 ----------------------- dlls/ntdll/signal_arm64.c | 130 --------------------- dlls/ntdll/signal_i386.c | 171 ++------------------------- dlls/ntdll/signal_powerpc.c | 241 --------------------------------------- dlls/ntdll/signal_x86_64.c | 195 ------------------------------- dlls/ntdll/thread.c | 12 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 88 ++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 86 ++++++++++++++ dlls/ntdll/unix/signal_i386.c | 150 ++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 141 +++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 128 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 40 +++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 660 insertions(+), 870 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c32b2dd9368137eca3c…

1 0

Alexandre Julliard : ntdll: Move the virtual memory functions to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: c96ef78b6d6d9184d8ec4cd18924a3049d388583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96ef78b6d6d9184d8ec4cd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:08:59 2020 +0200 ntdll: Move the virtual memory functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 18 +- dlls/ntdll/loader.c | 12 +- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_arm.c | 4 +- dlls/ntdll/signal_arm64.c | 4 +- dlls/ntdll/signal_i386.c | 22 +- dlls/ntdll/signal_powerpc.c | 4 +- dlls/ntdll/signal_x86_64.c | 10 +- dlls/ntdll/thread.c | 12 +- dlls/ntdll/unix/loader.c | 43 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/thread.c | 19 - dlls/ntdll/unix/unix_private.h | 28 +- dlls/ntdll/unix/virtual.c | 3897 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 63 +- dlls/ntdll/virtual.c | 3801 ++------------------------------------- 16 files changed, 4134 insertions(+), 3807 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c96ef78b6d6d9184d8ec…

1 0

Alexandre Julliard : ntdll: Use the local server_send_fd() function in the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 9fe61171e515e7c77720675ecbe69731219b549c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe61171e515e7c77720675e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:39:28 2020 +0200 ntdll: Use the local server_send_fd() function in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5843cde23f..17b23e58d2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1053,7 +1053,7 @@ NTSTATUS CDECL server_fd_to_handle( int fd, unsigned int access, unsigned int at NTSTATUS ret; *handle = 0; - wine_server_send_fd( fd ); + server_send_fd( fd ); SERVER_START_REQ( alloc_file_handle ) { @@ -1494,8 +1494,8 @@ size_t CDECL server_init_thread( void *entry_point, BOOL *suspend, unsigned int /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); - wine_server_send_fd( reply_pipe[1] ); - wine_server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); + server_send_fd( reply_pipe[1] ); + server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); ntdll_get_thread_data()->reply_fd = reply_pipe[0]; close( reply_pipe[1] );

1 0

Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 9c95434095630aa1ed4f1ae3763424f09f423575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c95434095630aa1ed4f1ae3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96..04b40b0863 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f3..7aac6864e5 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT

1 0

Biswapriyo Nath : include: Add missing structures in dcommon.idl.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 48020f4846cca1a02f4e1dc037e2cc2068df5e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48020f4846cca1a02f4e1dc0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri May 15 19:10:41 2020 +0530 include: Add missing structures in dcommon.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 4 +-- dlls/d2d1/device.c | 4 +-- dlls/d2d1/geometry.c | 4 +-- dlls/d2d1/state_block.c | 4 +-- dlls/d2d1/tests/d2d1.c | 64 +++++++++++++++++------------------ include/d2dbasetypes.h | 10 ------ include/dcommon.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 128 insertions(+), 51 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 1f455897f6..07d2e26a14 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -237,11 +237,11 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, enum d2d_brush_type type, const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index acecb2058a..3c8431ce8f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -23,11 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; struct d2d_draw_text_layout_ctx { diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9c5e653f56..c32de31035 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -30,11 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define D2D_FP_EPS (1.0f / (1 << FLT_MANT_DIG)) static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; enum d2d_cdt_edge_next { diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index e3175146a6..501d94ae3e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -165,11 +165,11 @@ void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *fac const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; state_block->ID2D1DrawingStateBlock1_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c0ee91099..87c87324f3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1096,11 +1096,11 @@ static void test_clip(void) HRESULT hr; BOOL match; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; if (!(device = create_device())) { @@ -1302,23 +1302,23 @@ static void test_state_block(void) HWND window; HRESULT hr; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform1 = - { + {{{ 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform2 = - { + {{{ 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, - }; + }}}; if (!(device = create_device())) { @@ -8613,57 +8613,57 @@ static void test_invert_matrix(void) } invert_tests[] = { - { { 0 }, { 0 }, FALSE }, + { {{{ 0 }}}, {{{ 0 }}}, FALSE }, { - { + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, + }}}, FALSE }, { - { + {{{ 2.0f, 0.0f, 0.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 0.5f, -0.0f, -0.0f, 0.5f, -2.0f, -4.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 2.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, -0.5f, -1.0f, 1.0f, 4.0f, -6.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 3.0f, 1.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ -1.0f, 1.0f, 3.0f, -2.0f, -20.0f, 12.0f - }, + }}}, TRUE }, }; @@ -8697,13 +8697,13 @@ static void test_skew_matrix(void) } skew_tests[] = { - { 0.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { 45.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f } }, - { 0.0f, 0.0f, { 10.0f, -3.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { -45.0f, 45.0f, { 0.1f, 0.5f }, { 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f } }, - { -45.0f, 45.0f, { 1.0f, 2.0f }, { 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f } }, - { 45.0f, -45.0f, { 1.0f, 2.0f }, { 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f } }, - { 30.0f, -60.0f, { 12.0f, -5.0f }, { 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f } }, + { 0.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { 45.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f }}} }, + { 0.0f, 0.0f, { 10.0f, -3.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { -45.0f, 45.0f, { 0.1f, 0.5f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f }}} }, + { -45.0f, 45.0f, { 1.0f, 2.0f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f }}} }, + { 45.0f, -45.0f, { 1.0f, 2.0f }, {{{ 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f }}} }, + { 30.0f, -60.0f, { 12.0f, -5.0f }, {{{ 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f }}} }, }; unsigned int i; diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index b231081647..a160a89021 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -29,16 +29,6 @@ typedef struct D3DCOLORVALUE typedef D3DCOLORVALUE D2D_COLOR_F; -typedef struct D2D_MATRIX_3X2_F -{ - float _11; - float _12; - float _21; - float _22; - float _31; - float _32; -} D2D_MATRIX_3X2_F; - typedef struct D2D_RECT_F { float left; diff --git a/include/dcommon.idl b/include/dcommon.idl index 53281bd487..43c82eb8a7 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -23,6 +23,12 @@ typedef struct { long x, y; } POINT; + +typedef struct +{ + long left, top, right, bottom; +} RECT; + typedef unsigned int UINT32; cpp_quote("#endif") @@ -52,7 +58,7 @@ typedef enum D2D1_ALPHA_MODE D2D1_ALPHA_MODE_PREMULTIPLIED = 1, D2D1_ALPHA_MODE_STRAIGHT = 2, D2D1_ALPHA_MODE_IGNORE = 3, - D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff } D2D1_ALPHA_MODE; typedef struct D2D1_PIXEL_FORMAT @@ -69,12 +75,76 @@ typedef struct D2D_POINT_2F typedef POINT D2D_POINT_2L, D2D1_POINT_2L; +typedef struct D2D_VECTOR_2F +{ + float x; + float y; +} D2D_VECTOR_2F; + +typedef struct D2D_VECTOR_3F +{ + float x; + float y; + float z; +} D2D_VECTOR_3F; + +typedef struct D2D_VECTOR_4F +{ + float x; + float y; + float z; + float w; +} D2D_VECTOR_4F; + +typedef RECT D2D_RECT_L, D2D1_RECT_L; + typedef struct D2D_SIZE_U { UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; +typedef struct D2D_MATRIX_3X2_F +{ + union + { + struct + { + float m11; + float m12; + float m21; + float m22; + float dx; + float dy; + }; + + struct + { + float _11, _12; + float _21, _22; + float _31, _32; + }; + + float m[3][2]; + }; +} D2D_MATRIX_3X2_F; + +typedef struct D2D_MATRIX_4X3_F +{ + union + { + struct + { + float _11, _12, _13; + float _21, _22, _23; + float _31, _32, _33; + float _41, _42, _43; + }; + + float m[4][3]; + }; +} D2D_MATRIX_4X3_F; + typedef struct D2D_MATRIX_4X4_F { union @@ -90,3 +160,20 @@ typedef struct D2D_MATRIX_4X4_F float m[4][4]; }; } D2D_MATRIX_4X4_F; + +typedef struct D2D_MATRIX_5X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + float _51, _52, _53, _54; + }; + + float m[5][4]; + }; +} D2D_MATRIX_5X4_F;

1 0

Henri Verbeet : wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: f06f28cf0425cf2f95cda497ed52e06587d551da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06f28cf0425cf2f95cda497… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:02 2020 +0430 wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ba34938828..0c95f7a43a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -320,7 +320,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr struct wined3d_context *context; DWORD map_binding; - if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized + if (!(conv = find_converter(src_format->id, dst_format->id)) && ((device->wined3d->flags & WINED3D_NO3D) || !is_identity_fixup(src_format->color_fixup) || src_format->conv_byte_count || !is_identity_fixup(dst_format->color_fixup) || dst_format->conv_byte_count || ((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED)

1 0

Henri Verbeet : wined3d: Set "device->d3d_initialized" in wined3d_device_set_implicit_swapchain().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 35b232626529bb5fc69004a519671560d375aefe URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b232626529bb5fc69004a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:03 2020 +0430 wined3d: Set "device->d3d_initialized" in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 -- dlls/wined3d/device.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4e953207e4..0c7f953702 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4618,8 +4618,6 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; - device->d3d_initialized = TRUE; - return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 450980719e..9b59371bb2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1099,6 +1099,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; + device->d3d_initialized = TRUE; device_init_swapchain_state(device, swapchain); @@ -1153,7 +1154,6 @@ static void device_free_blend_state(struct wine_rb_entry *entry, void *context) void wined3d_device_uninit_3d(struct wined3d_device *device) { - BOOL no3d = device->wined3d->flags & WINED3D_NO3D; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; @@ -1161,7 +1161,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); - if (!device->d3d_initialized && !no3d) + if (!device->d3d_initialized) { ERR("Called while 3D support was not initialised.\n"); return;

1 0

Rémi Bernon : d3d10core: Directly call DXGID3D10CreateDevice().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: a5a1bcbdaf981ba34e833f62f1bbb6530ee6dcd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a1bcbdaf981ba34e833f62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 2 04:05:04 2020 +0430 d3d10core: Directly call DXGID3D10CreateDevice(). Instead of using D3D11CoreCreateDevice(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/Makefile.in | 2 +- dlls/d3d10core/d3d10core_main.c | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index cf7efb2741..e56e38c188 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d10core.dll IMPORTLIB = d3d10core -IMPORTS = d3d11 +IMPORTS = d3d11 dxgi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index d364be90d6..bbfa4e691a 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -22,12 +22,12 @@ #include "initguid.h" #define COBJMACROS -#include "d3d11.h" +#include "d3d10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device); +HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d11, IDXGIFactory *factory, IDXGIAdapter *adapter, + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device); HRESULT WINAPI D3D10CoreRegisterLayers(void) { @@ -39,20 +39,27 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device) { - ID3D11Device *device11; + IUnknown *dxgi_device; + HMODULE d3d11; HRESULT hr; TRACE("factory %p, adapter %p, flags %#x, feature_level %#x, device %p.\n", factory, adapter, flags, feature_level, device); - if (FAILED(hr = D3D11CoreCreateDevice(factory, adapter, flags, &feature_level, 1, &device11))) + d3d11 = LoadLibraryA("d3d11.dll"); + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, &feature_level, 1, (void **)&dxgi_device); + FreeLibrary(d3d11); + if (FAILED(hr)) + { + WARN("Failed to create device, hr %#x.\n", hr); return hr; + } - hr = ID3D11Device_QueryInterface(device11, &IID_ID3D10Device, (void **)device); - ID3D11Device_Release(device11); + hr = IUnknown_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)device); + IUnknown_Release(dxgi_device); if (FAILED(hr)) { - ERR("Device should implement ID3D10Device, returning E_FAIL.\n"); + ERR("Failed to query ID3D10Device interface, returning E_FAIL.\n"); return E_FAIL; }

1 0

Rémi Bernon : d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 2814e5ce0b9d9b1c058a8937692bce6212ac74b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2814e5ce0b9d9b1c058a8937… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 2 04:05:05 2020 +0430 d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11. The UPlay overlay tries to detect the device D3D version by querying this interface first. On d3d11 games, and as we are incorrectly advertising ID3D10Device, it decides to use d3d10 hooks and crashes the game after ~10 minutes. This is happening with "Splinter Cell: Blacklist" for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 8 ++++++++ dlls/d3d11/d3d11_private.h | 6 ++++++ dlls/d3d11/device.c | 6 ++++-- dlls/d3d11/tests/d3d11.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index a5854a93cc..dac59d0999 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -107,6 +107,7 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void) HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device) { + struct d3d_device *d3d_device; IUnknown *dxgi_device; HMODULE d3d11; HRESULT hr; @@ -130,6 +131,13 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return E_FAIL; } + if (!(d3d_device = impl_from_ID3D11Device(*device))) + { + ERR("Failed to retrieve device impl, returning E_FAIL.\n"); + return E_FAIL; + } + d3d_device->d3d11_only = TRUE; + return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 48c76959fa..cb2b9c3aed 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -537,6 +537,7 @@ struct d3d_device LONG refcount; D3D_FEATURE_LEVEL feature_level; + BOOL d3d11_only; struct d3d11_immediate_context immediate_context; @@ -552,6 +553,11 @@ struct d3d_device UINT stencil_ref; }; +static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) +{ + return CONTAINING_RECORD((ID3D11Device2 *)iface, struct d3d_device, ID3D11Device2_iface); +} + static inline struct d3d_device *impl_from_ID3D11Device2(ID3D11Device2 *iface) { return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device2_iface); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index aaeb98a205..edbba57a5d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3887,8 +3887,9 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface { *out = &device->ID3D11Device2_iface; } - else if (IsEqualGUID(riid, &IID_ID3D10Device1) - || IsEqualGUID(riid, &IID_ID3D10Device)) + else if (!device->d3d11_only + && (IsEqualGUID(riid, &IID_ID3D10Device1) + || IsEqualGUID(riid, &IID_ID3D10Device))) { *out = &device->ID3D10Device1_iface; } @@ -6241,6 +6242,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown; + device->d3d11_only = FALSE; d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 20acc0223e..e107d522b2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2110,8 +2110,8 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) check_interface(device, &IID_IDXGIDevice, TRUE, FALSE); check_interface(device, &IID_IDXGIDevice1, TRUE, FALSE); check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ - todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); - todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE); hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); @@ -2516,7 +2516,7 @@ static void test_texture1d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture1D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture1D_Release(d3d10_texture); @@ -2913,7 +2913,7 @@ static void test_texture2d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture2D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture2D_Release(d3d10_texture); @@ -3172,7 +3172,7 @@ static void test_texture3d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture3D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture3D_Release(d3d10_texture); @@ -3461,7 +3461,7 @@ static void test_create_buffer(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Buffer_GetDevice(d3d10_buffer, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Buffer_Release(d3d10_buffer); @@ -6621,8 +6621,8 @@ static void test_device_context_state(void) return; } - todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); - todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context);

1 0

Nikolay Sivov : mfmediaengine: Send "ratechange" event for both default and playback rate changes.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 6fa8ff69300d167b34a4c4b079ae6d5924ba1fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa8ff69300d167b34a4c4b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:04 2020 +0300 mfmediaengine: Send "ratechange" event for both default and playback rate changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 60 +++++++++++++++++++++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 32 +++++++++++++++-- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index fcef1be048..b9bf3c7027 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -76,6 +76,8 @@ struct media_engine IMFDXGIDeviceManager *dxgi_manager; enum media_engine_mode mode; unsigned int flags; + double playback_rate; + double default_playback_rate; IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -344,30 +346,70 @@ static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double rate; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + rate = engine->default_playback_rate; + LeaveCriticalSection(&engine->cs); + + return rate; } static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) { - FIXME("(%p, %f): stub.\n", iface, rate); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->default_playback_rate != rate) + { + engine->default_playback_rate = rate; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_RATECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double rate; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + rate = engine->playback_rate; + LeaveCriticalSection(&engine->cs); + + return rate; } static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) { - FIXME("(%p, %f): stub.\n", iface, rate); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->playback_rate != rate) + { + engine->playback_rate = rate; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_RATECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) @@ -672,6 +714,8 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; + engine->default_playback_rate = 1.0; + engine->playback_rate = 1.0; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a3db611e9f..4079e9aa70 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -310,15 +310,12 @@ todo_wine ok(!!state, "Unexpected state %d.\n", state); val = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); -todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 2.0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetPlaybackRate(media_engine); -todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); @@ -440,6 +437,34 @@ static void test_Play(void) IMFMediaEngine_Release(media_engine); } +static void test_playback_rate(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + double rate; + HRESULT hr; + + media_engine = create_media_engine(callback); + + rate = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); + ok(rate == 1.0, "Unexpected default rate.\n"); + + rate = IMFMediaEngine_GetPlaybackRate(media_engine); + ok(rate == 1.0, "Unexpected default rate.\n"); + + hr = IMFMediaEngine_SetPlaybackRate(media_engine, 0.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = IMFMediaEngine_GetPlaybackRate(media_engine); + ok(rate == 0.0, "Unexpected default rate.\n"); + + hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 0.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -464,6 +489,7 @@ START_TEST(mfmediaengine) test_CreateInstance(); test_Shutdown(); test_Play(); + test_playback_rate(); IMFMediaEngineClassFactory_Release(factory);

1 0