April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplay: Add support for same-thread event callback.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 826be590c00e22adb60b6aabe98c3a9400ad464d URL: https://source.winehq.org/git/wine.git/?a=commit;h=826be590c00e22adb60b6aab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:32 2021 +0300 mfplay: Add support for same-thread event callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 8f0fb61fe6f..c353fa33cc1 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat mf uuid mfuuid +IMPORTS = mfplat mf user32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index c08f496b508..246704c2799 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -30,7 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; + static LONG startup_refcount; +static HINSTANCE mfplay_instance; static void platform_startup(void) { @@ -65,6 +68,7 @@ struct media_player IPropertyStore *propstore; IMFSourceResolver *resolver; MFP_CREATION_OPTIONS options; + HWND event_window; }; struct generic_event @@ -225,6 +229,23 @@ static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, return S_OK; } +static LRESULT WINAPI media_player_event_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct media_event *event = (void *)lparam; + struct media_player *player; + + if (msg == WM_USER) + { + player = impl_from_IMFPMediaPlayer(event->u.header.pMediaPlayer); + if (player->callback) + IMFPMediaPlayerCallback_OnMediaPlayerEvent(player->callback, &event->u.header); + IUnknown_Release(&event->IUnknown_iface); + return 0; + } + + return DefWindowProcW(hwnd, msg, wparam, lparam); +} + static HRESULT WINAPI media_item_QueryInterface(IMFPMediaItem *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -539,7 +560,8 @@ static void media_player_queue_event(struct media_player *player, struct media_e } else { - /* FIXME: same-thread callback notification */ + IUnknown_AddRef(&event->IUnknown_iface); + PostMessageW(player->event_window, WM_USER, 0, (LPARAM)event); } } @@ -595,6 +617,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) IPropertyStore_Release(player->propstore); if (player->resolver) IMFSourceResolver_Release(player->resolver); + DestroyWindow(player->event_window); heap_free(player); platform_shutdown(); @@ -1168,6 +1191,11 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) goto failed; + if (!(object->options & MFP_OPTION_FREE_THREADED_CALLBACK)) + { + object->event_window = CreateWindowW(eventclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, + 0, mfplay_instance, NULL); + } *player = &object->IMFPMediaPlayer_iface; @@ -1179,3 +1207,32 @@ failed: return hr; } + +static void media_player_register_window_class(void) +{ + WNDCLASSW cls = { 0 }; + + cls.lpfnWndProc = media_player_event_proc; + cls.hInstance = mfplay_instance; + cls.lpszClassName = eventclassW; + + RegisterClassW(&cls); +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + mfplay_instance = instance; + DisableThreadLibraryCalls(instance); + media_player_register_window_class(); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + UnregisterClassW(eventclassW, instance); + break; + } + + return TRUE; +}

1 0

Jacek Caban : winegcc: Use paths for found libraries on PE targets when using msvcrt.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: c7a210bc2f2758204e99d6c80544348c21e8703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a210bc2f2758204e99d6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 6 00:36:29 2021 +0200 winegcc: Use paths for found libraries on PE targets when using msvcrt. We use -nodefaultlibs now, so we don't need to worry about GCC additions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9297a9b75bd..ae8f64f099d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1393,7 +1393,7 @@ static void build(struct options* opts) strarray_add(link_args, name); break; case 'a': - if (is_pe && !opts->lib_suffix && strchr(name, '/')) + if (is_pe && !opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even

1 0

Jacek Caban : winegcc: Add Wine include directories before standard directories on search list.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 4f787812999b3b26f04b322fa0d78724596878c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f787812999b3b26f04b322f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 6 00:36:41 2021 +0200 winegcc: Add Wine include directories before standard directories on search list. This is especially important for msvcrt headers, which need to be used instead of system ones. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ae8f64f099d..694e2544a24 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -915,16 +915,17 @@ no_compat_defines: } strarray_add(comp_args, "-D__MSVCRT__"); } - if (includedir) + if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { - strarray_add( comp_args, strmake( "-I%s", includedir )); - strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); } + if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] )); } } else if (opts->wine_objdir)

1 0

Zebediah Figura : d3d9: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: a1ae5f1eca75ca24430e123ed44a0e32b7c9c712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ae5f1eca75ca24430e123e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:18 2021 -0500 d3d9: Use wined3d_device_context methods. 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/d3d9_private.h | 1 + dlls/d3d9/device.c | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index dc7c4ca3b1c..7bb277c2a75 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -93,6 +93,7 @@ struct d3d9_device struct wined3d_device_parent device_parent; LONG refcount; struct wined3d_device *wined3d_device; + struct wined3d_device_context *immediate_context; unsigned int adapter_ordinal; struct d3d9 *d3d_parent; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aa216edfcc0..2cd9d73d0d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2025,7 +2025,7 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO wined3d_mutex_lock(); rtv = surface_impl ? d3d9_surface_acquire_rendertarget_view(surface_impl) : NULL; - hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); + hr = wined3d_device_context_set_rendertarget_view(device->immediate_context, idx, rtv, TRUE); d3d9_surface_release_rendertarget_view(surface_impl, rtv); if (SUCCEEDED(hr)) { @@ -2086,7 +2086,7 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL; - hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d9_surface_release_rendertarget_view(ds_impl, rtv); wined3d_mutex_unlock(); @@ -3018,7 +3018,6 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); unsigned int vertex_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -3035,12 +3034,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface, @@ -3072,10 +3070,9 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); - wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3183,10 +3180,9 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + d3d9_rts_flag_auto_gen_mipmap(device); done: wined3d_mutex_unlock(); @@ -3322,11 +3318,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa d3d9_generate_auto_mipmaps(device); wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, wined3dformat_from_d3dformat(index_format)); - wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_context_draw_indexed(device->immediate_context, + vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); @@ -4737,6 +4733,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } + device->immediate_context = wined3d_device_get_immediate_context(device->wined3d_device); wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps); d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps); device->max_user_clip_planes = caps.MaxUserClipPlanes;

1 0

Zebediah Figura : d3d8: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 19d5e7cae26f1f764c9b5ea4ed7cc11b87711a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d5e7cae26f1f764c9b5ea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:19 2021 -0500 d3d8: Use wined3d_device_context methods. 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/d3d8_private.h | 1 + dlls/d3d8/device.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index bb25be16de0..755991a64c7 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -114,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + struct wined3d_device_context *immediate_context; unsigned int adapter_ordinal; struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f0bfab660a7..8464b99e32c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1534,17 +1534,17 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; - hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); if (SUCCEEDED(hr)) { rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; if (render_target) { - if (SUCCEEDED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + if (SUCCEEDED(hr = wined3d_device_context_set_rendertarget_view(device->immediate_context, 0, rtv, TRUE))) device_reset_viewport_state(device); else - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + wined3d_device_context_set_depth_stencil_view(device->immediate_context, original_dsv); } d3d8_surface_release_rendertarget_view(rt_impl, rtv); } @@ -2495,7 +2495,6 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int vertex_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -2505,10 +2504,10 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, @@ -2535,7 +2534,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_index, start_idx, index_count, 0, 0); wined3d_mutex_unlock(); return D3D_OK; @@ -2629,7 +2628,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); done: @@ -2687,6 +2686,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; + unsigned int base_vertex_idx; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -2753,11 +2753,13 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, wined3dformat_from_d3dformat(index_format)); - wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + base_vertex_idx = vb_pos / vertex_stride - min_vertex_idx; + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_context_draw_indexed(device->immediate_context, + base_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); @@ -3775,6 +3777,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + device->immediate_context = wined3d_device_get_immediate_context(device->wined3d_device); wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst;

1 0

Zebediah Figura : ddraw: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: e516e5e936de44016985363038ac43a9527699f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e516e5e936de440169853630… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:20 2021 -0500 ddraw: Use wined3d_device_context methods. 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/ddraw/ddraw.c | 5 +++-- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 31 ++++++++++++++++--------------- dlls/ddraw/executebuffer.c | 4 ++-- dlls/ddraw/surface.c | 8 ++++---- 5 files changed, 27 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e516e5e936de44016985…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: fce629235cc17d3f615aec4c067c9da6a94502da URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce629235cc17d3f615aec4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:21 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter(). 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/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ef3c0c76c14..462e6d8a93b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2615,12 +2615,12 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void * wined3d_resource_release(&op->buffer->resource); } -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) { struct wined3d_cs_copy_uav_counter *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; op->buffer = dst_buffer; op->offset = offset; @@ -2628,7 +2628,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff wined3d_resource_acquire(&dst_buffer->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b22f7b2086..540dcfdcc9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4818,7 +4818,7 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", device, dst_buffer, offset, uav); - wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); + wined3d_device_context_emit_copy_uav_counter(&device->cs->c, dst_buffer, offset, uav); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db6b6488e59..957290c7ece 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4733,8 +4733,6 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4783,6 +4781,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, + struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_copy_uav_counter().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: c541c1e9f903b2d4d7d26e61697bd9cf38ce7dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c541c1e9f903b2d4d7d26e61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:22 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_copy_uav_counter(). 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/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2738ff1a5bd..e84f88ff5f2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1273,7 +1273,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext1 *iface, ID3D11Buffer *dst_buffer, UINT dst_offset, ID3D11UnorderedAccessView *src_view) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_unordered_access_view *uav; struct d3d_buffer *buffer_impl; @@ -1284,7 +1284,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); wined3d_mutex_lock(); - wined3d_device_copy_uav_counter(device->wined3d_device, + wined3d_device_context_copy_uav_counter(context->wined3d_context, buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 540dcfdcc9f..c03621c706a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4812,13 +4812,13 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } -void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, +void CDECL wined3d_device_context_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) { - TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", - device, dst_buffer, offset, uav); + TRACE("context %p, dst_buffer %p, offset %u, uav %p.\n", + context, dst_buffer, offset, uav); - wined3d_device_context_emit_copy_uav_counter(&device->cs->c, dst_buffer, offset, uav); + wined3d_device_context_emit_copy_uav_counter(context, dst_buffer, offset, uav); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 918e9e253cc..3ea90e0c925 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -46,7 +46,6 @@ @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) -@ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @@ -166,6 +165,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 18dab157834..bff77b2b949 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2363,8 +2363,6 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); -void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, - struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, @@ -2557,6 +2555,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context,

1 0

Piotr Caban : msvcp90: Add macro that define type_info vtable.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 6568a8cb628e3c28839a7859c1ed7eb38fc9af92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6568a8cb628e3c28839a7859… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 6 17:05:09 2021 +0300 msvcp90: Add macro that define type_info vtable. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 32 ++++++++++++++++++++++++++++++++ dlls/msvcp90/exception.c | 32 ++------------------------------ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 02735a3c168..5052f433875 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -449,3 +449,35 @@ typedef struct } cxx_exception_type; #endif + +#define CREATE_TYPE_INFO_VTABLE\ + static void MSVCP_type_info_dtor(type_info * _this) \ +{ \ + free(_this->name); \ +} \ +\ +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) \ +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) \ +{ \ + if (flags & 2) \ + { \ + /* we have an array, with the number of elements stored before the first object */ \ + INT_PTR i, *ptr = (INT_PTR *)_this - 1; \ +\ + for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); \ + free(ptr); \ + } \ + else \ + { \ + MSVCP_type_info_dtor(_this); \ + if (flags & 1) free(_this); \ + } \ + return _this; \ +} \ +\ +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \ +\ +__ASM_BLOCK_BEGIN(type_info_vtables) \ + __ASM_VTABLE(type_info, \ + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); \ +__ASM_BLOCK_END diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 8ea4e132a0f..496dd915608 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +CREATE_TYPE_INFO_VTABLE + #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 @@ -65,34 +67,6 @@ extern const vtable_ptr MSVCP_bad_cast_vtable; /* ??_7range_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_range_error_vtable; -static void MSVCP_type_info_dtor(type_info * _this) -{ - free(_this->name); -} - -/* Unexported */ -DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) -void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) -{ - TRACE("(%p %x)\n", _this, flags); - if (flags & 2) - { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCP_type_info_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) - /* ??0exception@@QAE(a)ABQBD@Z */ /* ??0exception@@QEAA(a)AEBQEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor,8) @@ -1022,8 +996,6 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #endif __ASM_BLOCK_BEGIN(exception_vtables) - __ASM_VTABLE(type_info, - VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what));

1 0

Arkadiusz Hiler : msvcp90: Add helpers for creating base class RTTI.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: f3f948a5a39ecff5d83f02e11256a0359624d54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f948a5a39ecff5d83f02e1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:05:10 2021 +0300 msvcp90: Add helpers for creating base class RTTI. Suggested by Piotr Caban. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 5052f433875..0c5b83f93f6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -46,7 +46,7 @@ #ifndef __x86_64__ -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -58,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static const rtti_base_array name ## _rtti_base_array = { \ { \ @@ -122,7 +125,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -134,7 +137,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + \ + static void init_ ## name ## _rtti(char *base) \ + { \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + } + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static rtti_base_array name ## _rtti_base_array = { \ { \

1 0