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

Ziqing Hui : include: Add defines for D2D1YCbCr effect.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 2ad52a5894d9ccd5511e699d9afb8594bc2a9dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad52a5894d9ccd5511e699d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Apr 3 10:37:41 2022 +0800 include: Add defines for D2D1YCbCr effect. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d2d1_2.idl | 1 + include/d2d1effects_1.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 40d6c00fb7b..c69194ef127 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ SOURCES = \ d2d1_2.idl \ d2d1_3.idl \ d2d1effects.idl \ + d2d1effects_1.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 39e285dc221..1fc9111151c 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -17,6 +17,7 @@ */ import "d2d1_1.idl"; +import "d2d1effects_1.idl"; typedef enum D2D1_RENDERING_PRIORITY { diff --git a/include/d2d1effects_1.idl b/include/d2d1effects_1.idl new file mode 100644 index 00000000000..03616b770e6 --- /dev/null +++ b/include/d2d1effects_1.idl @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Ziqing Hui for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1effects.idl"; + +cpp_quote("DEFINE_GUID(CLSID_D2D1YCbCr, 0x99503cc1,0x66c7,0x45c9,0xa8,0x75,0x8a,0xd8,0xa7,0x91,0x44,0x01);") + +typedef enum D2D1_YCBCR_PROP +{ + D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0x0, + D2D1_YCBCR_PROP_TRANSFORM_MATRIX = 0x1, + D2D1_YCBCR_PROP_INTERPOLATION_MODE = 0x2, + D2D1_YCBCR_PROP_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_PROP; + +typedef enum D2D1_YCBCR_CHROMA_SUBSAMPLING +{ + D2D1_YCBCR_CHROMA_SUBSAMPLING_AUTO = 0x0, + D2D1_YCBCR_CHROMA_SUBSAMPLING_420 = 0x1, + D2D1_YCBCR_CHROMA_SUBSAMPLING_422 = 0x2, + D2D1_YCBCR_CHROMA_SUBSAMPLING_444 = 0x3, + D2D1_YCBCR_CHROMA_SUBSAMPLING_440 = 0x4, + D2D1_YCBCR_CHROMA_SUBSAMPLING_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_CHROMA_SUBSAMPLING; + +typedef enum D2D1_YCBCR_INTERPOLATION_MODE +{ + D2D1_YCBCR_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_YCBCR_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_YCBCR_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_YCBCR_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_YCBCR_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_YCBCR_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, + D2D1_YCBCR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_INTERPOLATION_MODE;

1 0

Ziqing Hui : include: Add defines for D2D1HighlightsShadows effect.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: deb8d7fc2d4e28d2a4ebcdb5fcb74af00f1a6a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb8d7fc2d4e28d2a4ebcdb5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Apr 3 10:37:42 2022 +0800 include: Add defines for D2D1HighlightsShadows effect. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d2d1_3.idl | 1 + include/d2d1effects_2.idl | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c69194ef127..047e7ff9146 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ SOURCES = \ d2d1_3.idl \ d2d1effects.idl \ d2d1effects_1.idl \ + d2d1effects_2.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index b51adfdffdb..91835ee1a77 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -17,6 +17,7 @@ */ import "d2d1_2.idl"; +import "d2d1effects_2.idl"; typedef enum D2D1_INK_NIB_SHAPE { diff --git a/include/d2d1effects_2.idl b/include/d2d1effects_2.idl new file mode 100644 index 00000000000..79895361118 --- /dev/null +++ b/include/d2d1effects_2.idl @@ -0,0 +1,38 @@ +/* + * Copyright 2022 Ziqing Hui for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1effects_1.idl"; + +cpp_quote("DEFINE_GUID(CLSID_D2D1HighlightsShadows, 0xcadc8384,0x323f,0x4c7e,0xa3,0x61,0x2e,0x2b,0x24,0xdf,0x6e,0xe4);") + +typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP +{ + D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS = 0x0, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS = 0x1, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY = 0x2, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA = 0x3, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS = 0x4, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_FORCE_DWORD = 0xffffffff +} D2D1_HIGHLIGHTSANDSHADOWS_PROP; + +typedef enum D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA +{ + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR = 0x0, + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_SRGB = 0x1, + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_FORCE_DWORD = 0xffffffff +} D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA;

1 0

Ziqing Hui : d2d1: Add stubs for ID2D1Factory3.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: a45a4b0b48fb69ccd7a3db747f7726708a0689c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45a4b0b48fb69ccd7a3db74… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Apr 3 10:37:43 2022 +0800 d2d1: Add stubs for ID2D1Factory3. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 108 ++++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a45a4b0b48fb69ccd7a3…

1 0

Nikolay Sivov : explorerframe/tests: Use CRT memory allocation functions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: cc2b468b6252af3997830601e87267f20c307847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2b468b6252af3997830601… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:39:09 2022 +0300 explorerframe/tests: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/msg.h | 9 ++++----- dlls/explorerframe/tests/nstc.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index 857278e4ef2..2a1752fda9f 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -67,13 +66,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); + msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -90,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -110,5 +109,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f11ae0b1923..e8c771f7eec 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -364,7 +364,7 @@ static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2351,8 +2351,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - heap_free(pnstceimpl); - heap_free(pnstceimpl2); + free(pnstceimpl); + free(pnstceimpl2); } IShellItem_Release(psi);

1 0

Nikolay Sivov : uianimation: Use CRT allocation functions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: e12a7c3d02f00328cfa1e85efdcc364e858c9ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12a7c3d02f00328cfa1e85e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:39:44 2022 +0300 uianimation: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c338d836978..22bb58ddbe2 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -31,7 +31,6 @@ #include "initguid.h" #include "uianimation.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uianimation); @@ -151,7 +150,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -308,7 +307,7 @@ const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl = static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj ) { - struct animation_storyboard *This = heap_alloc( sizeof(*This) ); + struct animation_storyboard *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl; @@ -371,7 +370,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -498,7 +497,7 @@ const struct IUIAnimationVariableVtbl animation_var_vtbl = static HRESULT animation_var_create(DOUBLE initial, IUIAnimationVariable **obj ) { - struct animation_var *This = heap_alloc( sizeof(*This) ); + struct animation_var *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl; @@ -561,7 +560,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) if (!ref) { - heap_free( This ); + free( This ); } return ref; @@ -730,7 +729,7 @@ const struct IUIAnimationManagerVtbl manager_vtbl = static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) { - struct manager *This = heap_alloc( sizeof(*This) ); + struct manager *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -793,7 +792,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -866,7 +865,7 @@ const struct IUIAnimationTimerVtbl timer_vtbl = static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) { - struct timer *This = heap_alloc( sizeof(*This) ); + struct timer *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) @@ -930,7 +929,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -953,7 +952,7 @@ const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl = static HRESULT transition_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_factory *This = heap_alloc( sizeof(*This) ); + struct tr_factory *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -1017,7 +1016,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -1141,7 +1140,7 @@ const struct IUIAnimationTransitionLibraryVtbl tr_library_vtbl = static HRESULT library_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_library *This = heap_alloc( sizeof(*This) ); + struct tr_library *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : include: Add IDebugControl4 definition.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 25729ffab7d76f96ef21c0f4e60bed9c160ac5a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25729ffab7d76f96ef21c0f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:36 2022 +0300 include: Add IDebugControl4 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25729ffab7d76f96ef21…

1 0

Nikolay Sivov : dbgeng: Update to IDebugControl4 stub.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 4f40fe587b0683c7a14311e1c37fd5b33e507446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f40fe587b0683c7a14311e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:37 2022 +0300 dbgeng: Update to IDebugControl4 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 828 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 707 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f40fe587b0683c7a143…

1 0

Nikolay Sivov : include: Add IDebugAdvanced3 definition.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 2c7ace25782e1620a59667d884b81f6f8108395f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c7ace25782e1620a59667d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:38 2022 +0300 include: Add IDebugAdvanced3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/dbgeng.h b/include/dbgeng.h index e417704915a..4322eff5302 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -47,6 +47,8 @@ DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed, 0x8c, 0x7e DEFINE_GUID(IID_IDebugControl3, 0x7df74a86, 0xb03f, 0x407f, 0x90, 0xab, 0xa2, 0x0d, 0xad, 0xce, 0xad, 0x08); DEFINE_GUID(IID_IDebugControl4, 0x94e60ce9, 0x9b41, 0x4b19, 0x9f, 0xc0, 0x6d, 0x9e, 0xb3, 0x52, 0x72, 0xb3); DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd, 0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89); +DEFINE_GUID(IID_IDebugAdvanced2, 0x716d14c9, 0x119b, 0x4ba5, 0xaf, 0x1f, 0x08, 0x90, 0xe6, 0x72, 0x41, 0x6a); +DEFINE_GUID(IID_IDebugAdvanced3, 0xcba4abb4, 0x84c4, 0x444d, 0x87, 0xca, 0xa0, 0x4e, 0x13, 0x28, 0x67, 0x39); DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c, 0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27); DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679, 0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee); DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9, 0xdf, 0xe5, 0xd9, 0xfc, 0x33, 0x0e); @@ -2347,6 +2349,67 @@ DECLARE_INTERFACE_(IDebugAdvanced, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugAdvanced2 +DECLARE_INTERFACE_(IDebugAdvanced2, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugAdvanced */ + STDMETHOD(GetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + STDMETHOD(SetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + /* IDebugAdvanced2 */ + STDMETHOD(Request)(THIS_ ULONG request, void *inbuffer, ULONG inbuffer_size, + void *outbuffer, ULONG outbuffer_size, ULONG *outsize) PURE; + STDMETHOD(GetSourceFileInformation)(THIS_ ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndToken)(THIS_ ULONG start_element, ULONG64 modaddr, const char *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, char *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; + STDMETHOD(GetSystemObjectInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, + void *buffer, ULONG buffer_size, ULONG *info_size) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugAdvanced3 +DECLARE_INTERFACE_(IDebugAdvanced3, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugAdvanced */ + STDMETHOD(GetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + STDMETHOD(SetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + /* IDebugAdvanced2 */ + STDMETHOD(Request)(THIS_ ULONG request, void *inbuffer, ULONG inbuffer_size, + void *outbuffer, ULONG outbuffer_size, ULONG *outsize) PURE; + STDMETHOD(GetSourceFileInformation)(THIS_ ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndToken)(THIS_ ULONG start_element, ULONG64 modaddr, const char *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, char *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; + STDMETHOD(GetSystemObjectInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, + void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + /* IDebugAdvanced3 */ + STDMETHOD(GetSourceFileInformationWide)(THIS_ ULONG which, WCHAR *source_file, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndTokenWide)(THIS_ ULONG start_element, ULONG64 modaddr, const WCHAR *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, WCHAR *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformationWide)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, WCHAR *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; +}; +#undef INTERFACE + #define INTERFACE IDebugSystemObjects DECLARE_INTERFACE_(IDebugSystemObjects, IUnknown) {

1 0

Nikolay Sivov : dbgeng: Update to IDebugAdvanced3 stub.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 5885f20c4af136d7a4f059d2ba3402c73d1862eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5885f20c4af136d7a4f059d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:39 2022 +0300 dbgeng: Update to IDebugAdvanced3 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 126 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 23 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index e0e7c3ff98e..3ec510ef296 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -63,7 +63,7 @@ struct debug_client IDebugDataSpaces IDebugDataSpaces_iface; IDebugSymbols3 IDebugSymbols3_iface; IDebugControl4 IDebugControl4_iface; - IDebugAdvanced IDebugAdvanced_iface; + IDebugAdvanced3 IDebugAdvanced3_iface; IDebugSystemObjects IDebugSystemObjects_iface; LONG refcount; ULONG engine_options; @@ -257,9 +257,9 @@ static struct debug_client *impl_from_IDebugControl4(IDebugControl4 *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugControl4_iface); } -static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +static struct debug_client *impl_from_IDebugAdvanced3(IDebugAdvanced3 *iface) { - return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced3_iface); } static struct debug_client *impl_from_IDebugSystemObjects(IDebugSystemObjects *iface) @@ -301,9 +301,11 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient7 *iface { *obj = &debug_client->IDebugControl4_iface; } - else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + else if (IsEqualIID(riid, &IID_IDebugAdvanced3) + || IsEqualIID(riid, &IID_IDebugAdvanced2) + || IsEqualIID(riid, &IID_IDebugAdvanced)) { - *obj = &debug_client->IDebugAdvanced_iface; + *obj = &debug_client->IDebugAdvanced3_iface; } else if (IsEqualIID(riid, &IID_IDebugSystemObjects)) { @@ -4266,28 +4268,25 @@ static const IDebugControl4Vtbl debugcontrolvtbl = debugcontrol_ResetManagedStatus, }; -static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced3 *iface, REFIID riid, void **obj) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_QueryInterface((IUnknown *)&debug_client->IDebugClient_iface, riid, obj); } -static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced3 *iface) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_AddRef((IUnknown *)&debug_client->IDebugClient_iface); } -static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced3 *iface) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_Release((IUnknown *)&debug_client->IDebugClient_iface); } -static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced3 *iface, void *context, ULONG context_size) { FIXME("%p, %p, %lu stub.\n", iface, context, context_size); @@ -4295,7 +4294,7 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced3 *iface, void *context, ULONG context_size) { FIXME("%p, %p, %lu stub.\n", iface, context, context_size); @@ -4303,17 +4302,98 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced * return E_NOTIMPL; } -static const IDebugAdvancedVtbl debugadvancedvtbl = +static HRESULT STDMETHODCALLTYPE debugadvanced_Request(IDebugAdvanced3 *iface, ULONG request, void *inbuffer, + ULONG inbuffer_size, void *outbuffer, ULONG outbuffer_size, ULONG *outsize) +{ + FIXME("%p, %lu, %p, %lu, %p, %lu, %p stub.\n", iface, request, inbuffer, inbuffer_size, outbuffer, outbuffer_size, outsize); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSourceFileInformation(IDebugAdvanced3 *iface, ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %p, %s, %#lx, %p, %lu, %p stub.\n", iface, which, sourcefile, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_FindSourceFileAndToken(IDebugAdvanced3 *iface, ULONG start_element, + ULONG64 modaddr, const char *filename, ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, + char *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %lu, %s, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, start_element, wine_dbgstr_longlong(modaddr), + debugstr_a(filename), flags, filetoken, filetokensize, found_element, buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSymbolInformation(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size, string_buffer, string_buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSystemObjectInformation(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), arg32, buffer, + buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSourceFileInformationWide(IDebugAdvanced3 *iface, ULONG which, + WCHAR *source_file, ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %p, %s, %#lx, %p, %lu, %p stub.\n", iface, which, source_file, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_FindSourceFileAndTokenWide(IDebugAdvanced3 *iface, ULONG start_element, + ULONG64 modaddr, const WCHAR *filename, ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, + WCHAR *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %lu, %s, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, start_element, wine_dbgstr_longlong(modaddr), + debugstr_w(filename), flags, filetoken, filetokensize, found_element, buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSymbolInformationWide(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size, WCHAR *string_buffer, ULONG string_buffer_size, + ULONG *string_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size, string_buffer, string_buffer_size, string_size); + + return E_NOTIMPL; +} + +static const IDebugAdvanced3Vtbl debugadvancedvtbl = { debugadvanced_QueryInterface, debugadvanced_AddRef, debugadvanced_Release, - /* IDebugAdvanced */ debugadvanced_GetThreadContext, debugadvanced_SetThreadContext, + debugadvanced_Request, + debugadvanced_GetSourceFileInformation, + debugadvanced_FindSourceFileAndToken, + debugadvanced_GetSymbolInformation, + debugadvanced_GetSystemObjectInformation, + debugadvanced_GetSourceFileInformationWide, + debugadvanced_FindSourceFileAndTokenWide, + debugadvanced_GetSymbolInformationWide, }; - static HRESULT STDMETHODCALLTYPE debugsystemobjects_QueryInterface(IDebugSystemObjects *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); @@ -4625,7 +4705,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl4_iface.lpVtbl = &debugcontrolvtbl; - debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; + debug_client->IDebugAdvanced3_iface.lpVtbl = &debugadvancedvtbl; debug_client->IDebugSystemObjects_iface.lpVtbl = &debugsystemobjectsvtbl; debug_client->refcount = 1; list_init(&debug_client->targets);

1 0

Zebediah Figura : winegstreamer: Disconnect source pins before calling wg_parser_disconnect().
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: db41b2ae238da4a8f73060948e94b8bdc64f64bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db41b2ae238da4a8f7306094… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:54 2022 -0500 winegstreamer: Disconnect source pins before calling wg_parser_disconnect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index bb7a71283c3..f38a0c16215 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1629,6 +1629,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; + /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). + * The stream pointers are no longer valid after wg_parser_disconnect(), so + * make sure we disable the streams first. */ + for (i = 0; i < This->source_count; ++i) + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } + wg_parser_disconnect(This->wg_parser); /* read_thread() needs to stay alive to service any read requests GStreamer @@ -1637,12 +1646,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); - for (i = 0; i < This->source_count; ++i) - { - if (This->sources[i]) - free_source_pin(This->sources[i]); - } - This->source_count = 0; free(This->sources); This->sources = NULL;

1 0