September 2019 - Wine-Commits

Zebediah Figura : strmbase: Get rid of the "pCritSec" member of BasePin.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: aa88c5d65b5a2606301ed3c61e83636f25ee2e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa88c5d65b5a2606301ed3c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:16 2019 -0500 strmbase: Get rid of the "pCritSec" member of BasePin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/parser.c | 20 ++++++++--------- dlls/quartz/pin.c | 49 ++++++++++++++++++++-------------------- dlls/strmbase/pin.c | 50 ++++++++++++++++++++--------------------- dlls/strmbase/renderer.c | 8 +++---- dlls/winegstreamer/gstdemux.c | 14 +++++------- dlls/wineqtdecoder/qtsplitter.c | 18 +++++++-------- include/wine/strmbase.h | 1 - 8 files changed, 78 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa88c5d65b5a2606301e…

1 0

Zebediah Figura : strmbase: Get rid of the no longer used pin constructor and destructor helpers.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 0a105660613211c8d3ab7026572078b333e9e91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a105660613211c8d3ab7026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:13 2019 -0500 strmbase: Get rid of the no longer used pin constructor and destructor helpers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 67 ------------------------------------------------- include/wine/strmbase.h | 6 ----- 2 files changed, 73 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4478855..1386f6b 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -731,31 +731,6 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) -{ - BaseOutputPin * pPinImpl; - - *ppPin = NULL; - - if (pPinInfo->dir != PINDIR_OUTPUT) - { - ERR("Pin direction(%x) != PINDIR_OUTPUT\n", pPinInfo->dir); - return E_INVALIDARG; - } - - assert(outputpin_size >= sizeof(BaseOutputPin)); - assert(vtbl->pfnAttemptConnection); - - pPinImpl = CoTaskMemAlloc(outputpin_size); - - if (!pPinImpl) - return E_OUTOFMEMORY; - - strmbase_source_init(pPinImpl, OutputPin_Vtbl, pPinInfo, vtbl, pCritSec); - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; -} - void strmbase_source_cleanup(BaseOutputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); @@ -764,13 +739,6 @@ void strmbase_source_cleanup(BaseOutputPin *pin) pin->pAllocator = NULL; } -HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) -{ - strmbase_source_cleanup(This); - CoTaskMemFree(This); - return S_OK; -} - /*** Input Pin implementation ***/ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) @@ -1090,34 +1058,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; } -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* vtbl, - LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, IPin ** ppPin) -{ - BaseInputPin * pPinImpl; - - *ppPin = NULL; - - assert(inputpin_size >= sizeof(BaseInputPin)); - assert(vtbl->base.pfnCheckMediaType); - - if (pPinInfo->dir != PINDIR_INPUT) - { - ERR("Pin direction(%x) != PINDIR_INPUT\n", pPinInfo->dir); - return E_INVALIDARG; - } - - pPinImpl = CoTaskMemAlloc(inputpin_size); - - if (!pPinImpl) - return E_OUTOFMEMORY; - - strmbase_sink_init(pPinImpl, InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator); - - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; -} - void strmbase_sink_cleanup(BaseInputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); @@ -1126,10 +1066,3 @@ void strmbase_sink_cleanup(BaseInputPin *pin) pin->pAllocator = NULL; pin->pin.IPin_iface.lpVtbl = NULL; } - -HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) -{ - strmbase_sink_cleanup(This); - CoTaskMemFree(This); - return S_OK; -} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d23231e..6bd00e1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -132,8 +132,6 @@ HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocato HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); -HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); -HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); void strmbase_source_cleanup(BaseOutputPin *pin); void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs); @@ -148,10 +146,6 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* pBaseInputFuncsTable, - LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); -HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This); void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, IMemAllocator *allocator); void strmbase_sink_cleanup(BaseInputPin *pin);

1 0

Rémi Bernon : winex11.drv: Explicitly call XUngrabPointer when clipping is released.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: ae4651b7ffad963aa1501b3ba5eb953141942a76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4651b7ffad963aa1501b3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:02 2019 +0200 winex11.drv: Explicitly call XUngrabPointer when clipping is released. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 97e2935..fff6fc7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -465,6 +465,7 @@ void ungrab_clipping_window(void) TRACE( "no longer clipping\n" ); XUnmapWindow( display, clip_window ); + if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); }

1 0

Rémi Bernon : winex11.drv: Retry last ClipCursor when grab is released.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 92177b0b161e91f1d609615d89d8e3199feea33f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92177b0b161e91f1d609615d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:00 2019 +0200 winex11.drv: Retry last ClipCursor when grab is released. As we ignore these NotifyGrab / NotifyUngrab w.r.t focus decisions, some applications are unaware of mouse grabs being lost and sometimes cursor clipping is lost. We have to keep the last clip rectangle and restore it when grab is released. This has been squashed with the foreground window check from Zhiyi Zhang <zzhang(a)codeweavers.com> to fix an issue that happens when switching from a fullscreen window - because there's some additional focus events involved - but in general, if the window that is getting focus cannot be activated: When FocusIn/NotifyWhileGrabbed is received, SetForegroundWindow is not called if the window cannot be activated. When the FocusIn/NotifyUngrab event arrives for the same window, we have to check the foreground window before restoring cursor clipping rectangle. For reference, the event sequence when pressing Alt-Tab - for WMs that grab the keyboard - is the following: 1. FocusOut/NotifyGrab, when WM grabs the keyboard. 2. FocusOut/NotifyWhileGrabbed, while WM switches windows, this calls SetForegroundWindow(GetDesktopWindow()). The event sequence for normal windows ends here, but for fullscreen windows, there may be these additional events: 3. FocusIn/NotifyWhileGrabbed, which may not change Wine foreground window if it cannot be activated. 4. FocusIn/NotifyUnGrab, when WM releases the keyboard while switching windows, this is ignored but it should not retry to grab the cursor, because window is not foreground. 5. FocusOut/NotifyNormal, when WM finishes switching the windows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 8 ++++++++ dlls/winex11.drv/mouse.c | 24 ++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 33 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 447aa50..59ab4ce 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -788,6 +788,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) break; case NotifyUngrab: keyboard_grabbed = FALSE; + retry_grab_clipping_window(); return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ } @@ -888,6 +889,13 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) break; case NotifyGrab: keyboard_grabbed = TRUE; + + /* This will do nothing due to keyboard_grabbed == TRUE, but it + * will save the current clipping rect so we can restore it on + * FocusIn with NotifyUngrab mode. + */ + retry_grab_clipping_window(); + return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a268cd9..97e2935 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -125,6 +125,9 @@ XContext cursor_context = 0; static HWND cursor_window; static HCURSOR last_cursor; static DWORD last_cursor_change; +static RECT last_clip_rect; +static HWND last_clip_foreground_window; +static BOOL last_clip_refused; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -395,8 +398,15 @@ static BOOL grab_clipping_window( const RECT *clip ) if (keyboard_grabbed) { WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); + last_clip_refused = TRUE; + last_clip_foreground_window = GetForegroundWindow(); + last_clip_rect = *clip; return FALSE; } + else + { + last_clip_refused = FALSE; + } /* enable XInput2 unless we are already clipping */ if (!data->clip_hwnd) enable_xinput2(); @@ -470,6 +480,20 @@ void reset_clipping_window(void) ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ } +/*********************************************************************** + * retry_grab_clipping_window + * + * Restore the current clip rectangle or retry the last one if it has + * been refused because of an active keyboard grab. + */ +void retry_grab_clipping_window(void) +{ + if (clipping_cursor) + ClipCursor( &clip_rect ); + else if (last_clip_refused && GetForegroundWindow() == last_clip_foreground_window) + ClipCursor( &last_clip_rect ); +} + BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); /*********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8418cae..d4e476f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -624,6 +624,7 @@ extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; +extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : vbscript/parser: Handle lack of newlines before certain End statements.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 9a6a4dc33ee77fd929cf77ab96d5e1ebaf51f5d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6a4dc33ee77fd929cf77ab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 5 15:48:05 2019 +0300 vbscript/parser: Handle lack of newlines before certain End statements. In the Windows vbscript parser, some End statements don't require a newline preceeding them. The game Ymir actually depends on this. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 11a8f9d..d4f5eb3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -122,7 +122,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <integer> tInt %token <dbl> tDouble -%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt +%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression @@ -155,6 +155,11 @@ SourceElements | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +BodyStatements + : /* empty */ { $$ = NULL; } + | Statement { $$ = $1; } + | StatementNl BodyStatements { $$ = link_statements($1, $2); } + StatementsNl_opt : /* empty */ { $$ = NULL; } | StatementsNl { $$ = $1; } @@ -399,25 +404,30 @@ ClassDeclaration ClassBody : /* empty */ { $$ = new_class_decl(ctx); } + | FunctionDecl { $$ = add_class_function(ctx, new_class_decl(ctx), $1); CHECK_ERROR; } | FunctionDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } /* FIXME: We should use DimDecl here to support arrays, but that conflicts with PropertyDecl. */ + | Storage tIdentifier { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; + $$ = add_dim_prop(ctx, new_class_decl(ctx), dim_decl, $1); CHECK_ERROR; } | Storage tIdentifier StSep ClassBody { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; $$ = add_dim_prop(ctx, $4, dim_decl, $1); CHECK_ERROR; } + | tDIM DimDecl { $$ = add_dim_prop(ctx, new_class_decl(ctx), $2, 0); CHECK_ERROR; } | tDIM DimDecl StSep ClassBody { $$ = add_dim_prop(ctx, $4, $2, 0); CHECK_ERROR; } + | PropertyDecl { $$ = add_class_function(ctx, new_class_decl(ctx), $1); CHECK_ERROR; } | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tPROPERTY + : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl - : Storage_opt tSUB Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tSUB + : Storage_opt tSUB Identifier ArgumentsDecl_opt StSep BodyStatements tEND tSUB { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } - | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tFUNCTION + | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt StSep BodyStatements tEND tFUNCTION { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } Storage_opt

1 0

Dmitry Timoshkov : localspl: Add support for monitors providing the MONITOR2 interface.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: d9518240c38a55ee1e2325ec0b1de631bcfc8460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9518240c38a55ee1e2325ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 12:01:02 2019 +0800 localspl: Add support for monitors providing the MONITOR2 interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 137 ++++++++++++++++++++++++++++------------------- 1 file changed, 82 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9518240c38a55ee1e23…

1 0

Michael Stefaniuc : d3d10: Avoid casts from COM object to interface.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: cfd1f614bc4d8ea1bc7496a4f09c2a8bf8ae33be URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfd1f614bc4d8ea1bc7496a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 4 22:59:57 2019 +0200 d3d10: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2390eee..4398334 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2716,14 +2716,14 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (index >= This->local_buffer_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } l = &This->local_buffers[index]; TRACE("Returning buffer %p, %s.\n", l, debugstr_a(l->name)); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, @@ -2741,13 +2741,13 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (l->name && !strcmp(l->name, name)) { TRACE("Returning buffer %p.\n", l); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) @@ -3529,7 +3529,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variab TRACE("iface %p\n", iface); - return (ID3D10EffectConstantBuffer *)This->buffer; + return (ID3D10EffectConstantBuffer *)&This->buffer->ID3D10EffectVariable_iface; } static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar(

1 0

Jactry Zeng : mfmediaengine: Merge media_engine_attributes into media_engine struct.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: b5bfc2768cabeda63e35ced51432988daa472507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5bfc2768cabeda63e35ced5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Sep 5 19:49:05 2019 +0800 mfmediaengine: Merge media_engine_attributes into media_engine struct. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 91 +++++++++++------------- dlls/mfmediaengine/tests/mfmediaengine.c | 117 +++++++++++-------------------- 2 files changed, 83 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5bfc2768cabeda63e35…

1 0

Dmitry Timoshkov : localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 64a5720d25a8fa10d2d73bc2e4ce152cbc50608d URL: https://source.winehq.org/git/wine.git/?a=commit;h=64a5720d25a8fa10d2d73bc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 12:00:59 2019 +0800 localspl: AddMonitor should create registry entry for a monitor before initializing it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd1981..29c5433 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,14 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; @@ -1537,7 +1529,20 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + { + RegDeleteKeyW(hroot, mi2w->pName); + res = FALSE; + } + else + { + monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + } } + RegCloseKey(hentry); }

1 0

Alistair Leslie-Hughes : hhctrl.ocx: Simplify extracting the help filename (Coverity).
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: ec83f0c53c8630dcbbf917337c82495aaf0946fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec83f0c53c8630dcbbf91733… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 5 00:18:17 2019 +0000 hhctrl.ocx: Simplify extracting the help filename (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 6a98ae4..893cdde 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -99,15 +99,12 @@ static const char *command_to_string(UINT command) static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) { - const WCHAR *extra; - WCHAR chm_file[MAX_PATH]; - static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; static const WCHAR delimW[] = {':',':',0}; static const WCHAR delim2W[] = {'>',0}; DWORD env_len; - WCHAR *filename; + WCHAR *filename, *extra; env_filename = skip_schema(env_filename); @@ -128,9 +125,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delim2W); if (extra) { - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + *extra = 0; if (window) *window = strdupW(extra+1); } @@ -138,10 +133,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delimW); if (extra) { - if (filename != chm_file) - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + *extra = 0; if (index) *index = strdupW(extra+2); }

1 0