wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Rémi Bernon : server: Add support for RIDEV_DEVNOTIFY rawinput flag.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 371be0bc1c7efe87ad91fa0efec8e9cee30cbd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=371be0bc1c7efe87ad91fa0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:19 2021 +0200 server: Add support for RIDEV_DEVNOTIFY rawinput flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 +- server/queue.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index f2d64ccc23b..d95d29d7656 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -468,7 +468,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK)) + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i); d[i].usage_page = devices[i].usUsagePage; diff --git a/server/queue.c b/server/queue.c index a0d46d75cf5..ef5aa02bdb3 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1685,6 +1685,8 @@ static int queue_rawinput_message( struct process* process, void *arg ) device = &entry->device; if (!device) return 0; + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; + if (process != raw_msg->foreground->process) { if (!(device->flags & RIDEV_INPUTSINK)) goto done;

1 0

Rémi Bernon : server: Add an explicit message field in rawinput_message.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 2d8f98fd4e9559f73d3282fb094eb116835ce732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8f98fd4e9559f73d3282fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:18 2021 +0200 server: Add an explicit message field in rawinput_message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 3a37dd96385..a0d46d75cf5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1662,6 +1662,7 @@ struct rawinput_message struct desktop *desktop; struct hw_msg_source source; unsigned int time; + unsigned int message; struct hardware_msg_data data; }; @@ -1697,7 +1698,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) goto done; msg->win = device->target; - msg->msg = WM_INPUT; + msg->msg = raw_msg->message; msg->wparam = wparam; msg->lparam = 0; memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); @@ -1773,6 +1774,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; + raw_msg.message = WM_INPUT; msg_data = &raw_msg.data; msg_data->info = input->mouse.info; @@ -1907,6 +1909,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; + raw_msg.message = WM_INPUT; msg_data = &raw_msg.data; msg_data->info = input->kbd.info;

1 0

Rémi Bernon : server: Add process argument to find_rawinput_device.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 427168ba5a1412a9ab53ee489821a4ab8c5726ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=427168ba5a1412a9ab53ee48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:17 2021 +0200 server: Add process argument to find_rawinput_device. And use it to find registered HID rawinput devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index b026c03e13d..3a37dd96385 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1489,11 +1489,11 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( unsigned short usage_page, unsigned short usage ) +static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { struct rawinput_device_entry *e; - LIST_FOR_EACH_ENTRY( e, &current->process->rawinput_devices, struct rawinput_device_entry, entry ) + LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) { if (e->device.usage_page != usage_page || e->device.usage != usage) continue; return e; @@ -1506,7 +1506,7 @@ static void update_rawinput_device(const struct rawinput_device *device) { struct rawinput_device_entry *e; - if (!(e = find_rawinput_device( device->usage_page, device->usage ))) + if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) { if (!(e = mem_alloc( sizeof(*e) ))) return; list_add_tail( &current->process->rawinput_devices, &e->entry ); @@ -1669,6 +1669,7 @@ struct rawinput_message static int queue_rawinput_message( struct process* process, void *arg ) { const struct rawinput_message* raw_msg = arg; + const struct rawinput_device_entry *entry; const struct rawinput_device *device = NULL; struct desktop *target_desktop = NULL; struct thread *target_thread = NULL; @@ -1679,6 +1680,8 @@ static int queue_rawinput_message( struct process* process, void *arg ) device = process->rawinput_mouse; else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; + else if ((entry = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ))) + device = &entry->device; if (!device) return 0; if (process != raw_msg->foreground->process) @@ -3296,9 +3299,9 @@ DECL_HANDLER(update_rawinput_devices) update_rawinput_device(&devices[i]); } - e = find_rawinput_device( 1, 2 ); + e = find_rawinput_device( current->process, 1, 2 ); current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( 1, 6 ); + e = find_rawinput_device( current->process, 1, 6 ); current->process->rawinput_kbd = e ? &e->device : NULL; }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for shutdown().
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: c64f454808c80d87c0d9d84769356d0061ffdf69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64f454808c80d87c0d9d847… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 11:40:21 2021 -0500 ws2_32/tests: Add some tests for shutdown(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c64f454808c80d87c0d9…

1 0

Zebediah Figura : ws2_32/tests: Add more tests for connect() and ConnectEx() with completion ports.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 32c095b0dafc9e845bdc73ffca857f945e796e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c095b0dafc9e845bdc73ff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 11:40:20 2021 -0500 ws2_32/tests: Add more tests for connect() and ConnectEx() with completion ports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 270 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 251 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c095b0dafc9e845bdc…

1 0

Zebediah Figura : ws2_32/tests: Do not close the port passed to CreateIoCompletionPort separately from the port returned.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 19246e508920c5ed5cb1bffbbdca7a540442146d URL: https://source.winehq.org/git/wine.git/?a=commit;h=19246e508920c5ed5cb1bffb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 11:40:19 2021 -0500 ws2_32/tests: Do not close the port passed to CreateIoCompletionPort separately from the port returned. They are the same port handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 60 ++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19246e508920c5ed5cb1…

1 0

Ziqing Hui : windowscodecs: Add stub for IWICDdsEncoder.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 6d39e6abe70b75a2b5dedf5f3d3a42a046e44883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d39e6abe70b75a2b5dedf5f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 11 10:48:39 2021 +0800 windowscodecs: Add stub for IWICDdsEncoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 63 ++++++++++++++++++++++++++++++++++++++++-- include/wincodec.idl | 19 +++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index e8a4f0e5c28..a102d4883cd 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -161,6 +161,7 @@ typedef struct DdsFrameDecode { typedef struct DdsEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; + IWICDdsEncoder IWICDdsEncoder_iface; LONG ref; CRITICAL_SECTION lock; IStream *stream; @@ -710,6 +711,11 @@ static inline DdsEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, DdsEncoder, IWICBitmapEncoder_iface); } +static inline DdsEncoder *impl_from_IWICDdsEncoder(IWICDdsEncoder *iface) +{ + return CONTAINING_RECORD(iface, DdsEncoder, IWICDdsEncoder_iface); +} + static inline DdsFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { return CONTAINING_RECORD(iface, DdsFrameEncode, IWICBitmapFrameEncode_iface); @@ -1705,6 +1711,57 @@ HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) return ret; } +static HRESULT WINAPI DdsEncoder_Dds_QueryInterface(IWICDdsEncoder *iface, REFIID iid, + void **ppv) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); +} + +static ULONG WINAPI DdsEncoder_Dds_AddRef(IWICDdsEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); +} + +static ULONG WINAPI DdsEncoder_Dds_Release(IWICDdsEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + return IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); +} + +static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, + WICDdsParameters *parameters) +{ + FIXME("(%p,%p): stub.\n", iface, parameters); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, + WICDdsParameters *parameters) +{ + FIXME("(%p,%p): stub.\n", iface, parameters); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, + IWICBitmapFrameEncode **frameEncode, + UINT *arrayIndex, UINT *mipLevel, UINT *sliceIndex) +{ + FIXME("(%p,%p,%p,%p,%p): stub.\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); + return E_NOTIMPL; +} + +static const IWICDdsEncoderVtbl DdsEncoder_Dds_Vtbl = +{ + DdsEncoder_Dds_QueryInterface, + DdsEncoder_Dds_AddRef, + DdsEncoder_Dds_Release, + DdsEncoder_Dds_SetParameters, + DdsEncoder_Dds_GetParameters, + DdsEncoder_Dds_CreateNewFrame +}; + static HRESULT WINAPI DdsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -1716,8 +1773,9 @@ static HRESULT WINAPI DdsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { *ppv = &This->IWICBitmapEncoder_iface; - } - else { + } else if (IsEqualIID(&IID_IWICDdsEncoder, iid)) { + *ppv = &This->IWICDdsEncoder_iface; + } else { *ppv = NULL; return E_NOINTERFACE; } @@ -1929,6 +1987,7 @@ HRESULT DdsEncoder_CreateInstance( REFIID iid, void **ppv) if (!This) return E_OUTOFMEMORY; This->IWICBitmapEncoder_iface.lpVtbl = &DdsEncoder_Vtbl; + This->IWICDdsEncoder_iface.lpVtbl = &DdsEncoder_Dds_Vtbl; This->ref = 1; This->stream = NULL; This->frame_count = 0; diff --git a/include/wincodec.idl b/include/wincodec.idl index 88e183d5796..6752341c02a 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1196,6 +1196,25 @@ interface IWICDdsDecoder : IUnknown [out, retval] IWICBitmapFrameDecode **bitmapFrame); }; +[ + object, + uuid(5cacdb4c-407e-41b3-b936-d0f010cd6732) +] +interface IWICDdsEncoder : IUnknown +{ + HRESULT SetParameters( + [in] WICDdsParameters *parameters); + + HRESULT GetParameters( + [out] WICDdsParameters *parameters); + + HRESULT CreateNewFrame( + [out] IWICBitmapFrameEncode **frameEncode, + [out, optional] UINT *arrayIndex, + [out, optional] UINT *mipLevel, + [out, optional] UINT *sliceIndex); +}; + [ object, uuid(3d4c0c61-18a4-41e4-bd80-481a4fc9f464)

1 0

Alexandre Julliard : include: Remove context definitions for obsolete platforms.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: dba8d3c3d4c6954d6a4c865c469cd69882a92f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba8d3c3d4c6954d6a4c865c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 11 13:23:30 2021 +0200 include: Remove context definitions for obsolete platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 6 +- include/winnt.h | 653 +---------------------------------------------- include/winternl.h | 6 - 3 files changed, 6 insertions(+), 659 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dba8d3c3d4c6954d6a4c…

1 0

Nikolay Sivov : dwrite: Check for allocation failures of glyph buffers.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 430145e43145017c73794a288b67538d814ce894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=430145e43145017c73794a28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 11 16:09:16 2021 +0300 dwrite: Check for allocation failures of glyph buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 93d507cf3dc..89c76da0bb9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1190,6 +1190,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = 0; + if (!context.u.subst.glyphs || !context.u.subst.glyph_props || !context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_glyphs(&context, scriptprops->scripttags); if (SUCCEEDED(hr)) @@ -1199,6 +1205,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); } +failed: heap_free(context.u.subst.glyph_props); heap_free(context.u.subst.glyphs); heap_free(context.glyph_infos); @@ -1261,12 +1268,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1331,12 +1345,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1805,7 +1826,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna context.cache = fontface_get_shaping_cache(font_obj); context.language_tag = get_opentype_language(locale); - context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); + if (!(context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)))) + return E_OUTOFMEMORY; props = &dwritescripts_properties[sa.script]; @@ -2355,7 +2377,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->ranges = heap_calloc(ranges_count, sizeof(*mapping->ranges)); memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; - mapping->families = heap_alloc_zero(sizeof(*mapping->families) * families_count); + mapping->families = heap_calloc(families_count, sizeof(*mapping->families)); mapping->families_count = families_count; for (i = 0; i < families_count; i++) mapping->families[i] = heap_strdupW(target_families[i]);

1 0

Zebediah Figura : d3d11: Store a d3d_device pointer in struct d3d11_device_context.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 762afeaa5f1a846fa142db7ef5127b9207dce3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=762afeaa5f1a846fa142db7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 01:35:14 2021 -0500 d3d11: Store a d3d_device pointer in struct d3d11_device_context. 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4f0e65e6e83..1a8cdc6d77c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -548,6 +548,7 @@ struct d3d11_device_context LONG refcount; struct wined3d_device_context *wined3d_context; + struct d3d_device *device; struct wined3d_private_store private_store; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5085313b999..0819918b2a1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -337,12 +337,6 @@ static inline struct d3d11_device_context *impl_from_ID3D11DeviceContext1(ID3D11 return CONTAINING_RECORD(iface, struct d3d11_device_context, ID3D11DeviceContext1_iface); } -static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext1(ID3D11DeviceContext1 *iface) -{ - struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); - return CONTAINING_RECORD(context, struct d3d_device, immediate_context); -} - static HRESULT STDMETHODCALLTYPE d3d11_device_context_QueryInterface(ID3D11DeviceContext1 *iface, REFIID iid, void **out) { @@ -375,14 +369,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_QueryInterface(ID3D11Devic static ULONG STDMETHODCALLTYPE d3d11_device_context_AddRef(ID3D11DeviceContext1 *iface) { struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); ULONG refcount = InterlockedIncrement(&context->refcount); TRACE("%p increasing refcount to %u.\n", context, refcount); if (refcount == 1) { - ID3D11Device2_AddRef(&device->ID3D11Device2_iface); + ID3D11Device2_AddRef(&context->device->ID3D11Device2_iface); } return refcount; @@ -391,14 +384,13 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_AddRef(ID3D11DeviceContext1 static ULONG STDMETHODCALLTYPE d3d11_device_context_Release(ID3D11DeviceContext1 *iface) { struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); ULONG refcount = InterlockedDecrement(&context->refcount); TRACE("%p decreasing refcount to %u.\n", context, refcount); if (!refcount) { - ID3D11Device2_Release(&device->ID3D11Device2_iface); + ID3D11Device2_Release(&context->device->ID3D11Device2_iface); } return refcount; @@ -449,11 +441,11 @@ static void d3d11_device_context_set_constant_buffers(ID3D11DeviceContext1 *ifac static void STDMETHODCALLTYPE d3d11_device_context_GetDevice(ID3D11DeviceContext1 *iface, ID3D11Device **device) { - struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D11Device *)&device_object->ID3D11Device2_iface; + *device = (ID3D11Device *)&context->device->ID3D11Device2_iface; ID3D11Device_AddRef(*device); } @@ -2827,8 +2819,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSGetConstantBuffers1(ID3D11D static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11DeviceContext1 *iface, ID3DDeviceContextState *state, ID3DDeviceContextState **prev) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_device_context_state *state_impl, *prev_impl; + struct d3d_device *device = context->device; struct wined3d_state *wined3d_state; TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); @@ -3095,6 +3088,7 @@ static void d3d11_device_context_init(struct d3d11_device_context *context, stru context->ID3D11Multithread_iface.lpVtbl = &d3d11_multithread_vtbl; context->refcount = 1; + context->device = device; ID3D11Device2_AddRef(&device->ID3D11Device2_iface); wined3d_private_store_init(&context->private_store);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021