June 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : Release 1.9.12.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 50917e283629cbe994f2d7f091ed46ac8b25cda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50917e283629cbe994f2d7f09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:04:01 2016 +0900 Release 1.9.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 721 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 339 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50917e283629cbe994f2d…

1 0

Nikolay Sivov : msscript: Added IOleControl stub.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 60e645c52022c57df8660b65906d5ffe05960dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e645c52022c57df8660b659… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 20:40:14 2016 +0300 msscript: Added IOleControl stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 80 ++++++++++++++++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 13 +++++++ 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a586c50..b2f4e77 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -33,6 +33,7 @@ struct ScriptControl { IScriptControl IScriptControl_iface; IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; + IOleControl IOleControl_iface; LONG ref; IOleClientSite *site; SIZEL extent; @@ -134,6 +135,11 @@ static inline ScriptControl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, ScriptControl, IPersistStreamInit_iface); } +static inline ScriptControl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IOleControl_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -148,14 +154,17 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID TRACE("(%p)->(IID_IScriptControl %p)\n", This, ppv); *ppv = &This->IScriptControl_iface; }else if(IsEqualGUID(&IID_IOleObject, riid)) { - TRACE("(%p)->(IID_IOleObject %p\n", This, ppv); + TRACE("(%p)->(IID_IOleObject %p)\n", This, ppv); *ppv = &This->IOleObject_iface; }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { - TRACE("(%p)->(IID_IPersistStreamInit %p\n", This, ppv); + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; }else if(IsEqualGUID(&IID_IPersist, riid)) { - TRACE("(%p)->(IID_IPersist %p\n", This, ppv); + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(&IID_IOleControl, riid)) { + TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); + *ppv = &This->IOleControl_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -777,6 +786,70 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *info) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%p)\n", This, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%p)\n", This, msg); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispid) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%#x)\n", This, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%d)\n", This, freeze); + + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -793,6 +866,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; + script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6dd7d67..f0245a6 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -178,6 +178,18 @@ static void test_persiststreaminit(void) IPersistStreamInit_Release(init); } +static void test_olecontrol(void) +{ + IOleControl *olecontrol; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IOleControl, (void**)&olecontrol); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IOleControl_Release(olecontrol); +} + START_TEST(msscript) { IUnknown *unk; @@ -195,6 +207,7 @@ START_TEST(msscript) test_oleobject(); test_persiststreaminit(); + test_olecontrol(); CoUninitialize(); }

1 0

Józef Kucia : wined3d: Recognize SM 5 gather4_c opcode.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 5c390537912384b9f2c0d3bf5fc508ab9cff89e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c390537912384b9f2c0d3bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:05 2016 +0200 wined3d: Recognize SM 5 gather4_c opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 70d7d34..5ac70ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5277,6 +5277,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9bbf461..55affc1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8611,6 +8611,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f8fdc50..55de679 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GATHER4 */ "gather4", + /* WINED3DSIH_GATHER4_C */ "gather4_c", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bff1f27..45a3d04 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -209,6 +209,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, @@ -743,6 +744,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", shader_sm5_read_control_point_count}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f45327..7207523 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -616,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOI, WINED3DSIH_FTOU, WINED3DSIH_GATHER4, + WINED3DSIH_GATHER4_C, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Alexandre Julliard : user32: Notify explorer when the active window changes.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 2e4f89edf1e394678b000d8d1c355422192e8267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4f89edf1e394678b000d8d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 14:05:38 2016 +0900 user32: Notify explorer when the active window changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index c47a82d..f1c8831 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -154,6 +154,8 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); + if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) + PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); } /* now change focus if necessary */

1 0

Nikolay Sivov : msscript: Claim success in InitNew().
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 75e3fe6259c669ad0ceb8a2883da0438b37555c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e3fe6259c669ad0ceb8a288… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 20:40:13 2016 +0300 msscript: Claim success in InitNew(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index efa20c0..a586c50 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -762,7 +762,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = {

1 0

Michael Stefaniuc : d3d10core/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 7c0d79770d914f590bc8ec8ba193b88268a948c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0d79770d914f590bc8ec8ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:41:32 2016 +0200 d3d10core/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 771dc39..dd97781 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3143,8 +3143,7 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); @@ -3542,8 +3541,7 @@ float4 main(float4 color : COLOR) : SV_TARGET && tmp_rect[i].top == i * 2 && tmp_rect[i].right == i + 1 && tmp_rect[i].bottom == (i + 1) * 2, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, @@ -3680,12 +3678,12 @@ float4 main(float4 color : COLOR) : SV_TARGET { if (!i) todo_wine ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); else ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(!count, "Got unexpected viewport count %u.\n", count);

1 0

Michael Stefaniuc : comdlg32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: db134bbd5a032f568a925b89f5715bf5e5d11387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db134bbd5a032f568a925b89f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:39:39 2016 +0200 comdlg32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 56 +++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0b55c5c..0fe2d84 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -422,63 +422,56 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L case cmb1: case edt1: ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0), - "control id %03x should have sized horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have sized horizontally and moved vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* sized horizontal and vertical */ case lst2: ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 10), - "control id %03x should have sized horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have sized horizontally and vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* moved horizontal and vertical */ case IDCANCEL: case pshHelp: ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0), - "control id %03x should have moved horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have moved horizontally and vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* moved vertically */ case chx1: case stc2: case stc3: ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0), - "control id %03x should have moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have moved vertically, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* resized horizontal */ case cmb2: /* aka IDC_LOOKIN */ ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)|| TESTRECTS( ctrlrcs[i], rc, 0, 0, 0, 0), /* Vista and higher */ - "control id %03x should have resized horizontally, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x should have resized horizontally, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* non moving non sizing controls */ case stc4: ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), - "control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x was moved/resized, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* todo_wine: non moving non sizing controls */ case lst1: todo_wine ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), - "control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + "control id %03x was moved/resized, before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); break; /* don't test: id is not unique */ case IDOK: @@ -487,10 +480,9 @@ todo_wine case -1: break; default: - trace("untested control id %03x before %d,%d-%d,%d after %d,%d-%d,%d\n", - ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, - ctrlrcs[i].right, ctrlrcs[i].bottom, - rc.left, rc.top, rc.right, rc.bottom); + trace("untested control id %03x before %s after %s\n", + ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), + wine_dbgstr_rect( &rc )); #undef TESTRECTS #undef MAXNRCTRLS }

1 0

Alexandre Julliard : explorer: Don' t bother with taskbar buttons when the taskbar is not visible.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 69b41aebdaa9aca5ae2b18dc52dfee05466eb43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b41aebdaa9aca5ae2b18dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 17:39:54 2016 +0900 explorer: Don't bother with taskbar buttons when the taskbar is not visible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 94ba74b..623743f 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -483,6 +483,8 @@ static void sync_taskbar_buttons(void) int right = tray_width - nb_displayed * icon_cx; HWND foreground = GetAncestor( GetForegroundWindow(), GA_ROOTOWNER ); + if (!IsWindowVisible( tray_window )) return; + LIST_FOR_EACH_ENTRY( win, &taskbar_buttons, struct taskbar_button, entry ) { if (!win->hwnd) /* start button */ @@ -597,6 +599,8 @@ static void add_taskbar_button( HWND hwnd ) { struct taskbar_button *win; + if (hide_systray) return; + /* ignore our own windows */ if (hwnd) { @@ -730,9 +734,9 @@ static void do_show_systray(void) tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, size.cy ); start_button_width = size.cx; - sync_taskbar_buttons(); SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); + sync_taskbar_buttons(); } static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Alexandre Julliard : explorer: Avoid crash on empty Start Menu folders.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 1b025eb0b5543f058025105a623a91659cdbe99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b025eb0b5543f058025105a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 13:47:02 2016 +0900 explorer: Avoid crash on empty Start Menu folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/startmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 15bb7b5..0d79aca 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -464,8 +464,8 @@ void do_startmenu(HWND hwnd) if (!public_startmenu.folder) pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder); - if (!shell_folder_is_empty(user_startmenu.folder) || - !shell_folder_is_empty(public_startmenu.folder)) + if ((user_startmenu.folder && !shell_folder_is_empty(user_startmenu.folder)) || + (public_startmenu.folder && !shell_folder_is_empty(public_startmenu.folder))) { fill_menu(&user_startmenu);

1 0

Michael Stefaniuc : d3d9/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: bcd38dec15eab510b482e9213cab6fc8ecda9b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd38dec15eab510b482e9213… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:44:30 2016 +0200 d3d9/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 27 ++++------ dlls/d3d9/tests/device.c | 126 +++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd38dec15eab510b482e…

1 0