wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Michael Stefaniuc : d3d10core/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 10 Jun '16

10 Jun '16

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 10 Jun '16

10 Jun '16

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 : user32: Notify explorer when the active window changes.
by Alexandre Julliard 10 Jun '16

10 Jun '16

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

Alexandre Julliard : explorer: Don' t bother with taskbar buttons when the taskbar is not visible.
by Alexandre Julliard 10 Jun '16

10 Jun '16

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 10 Jun '16

10 Jun '16

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

Nikolay Sivov : msscript: Implement GetExtent().
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 03b06fb76ba4204df5c20fda8955da09e16ec095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b06fb76ba4204df5c20fda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:27 2016 +0300 msscript: Implement GetExtent(). 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/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 19 +++++++++++++++++-- dlls/msscript.ocx/tests/Makefile.in | 2 +- dlls/msscript.ocx/tests/msscript.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index bc12e76..7d76896 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,7 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl -IMPORTS = ole32 oleaut32 +IMPORTS = gdi32 user32 ole32 oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d525b57..efa20c0 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -35,6 +35,7 @@ struct ScriptControl { IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; + SIZEL extent; }; static HINSTANCE msscript_instance; @@ -611,9 +612,13 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, aspect, size); + TRACE("(%p)->(%d %p)\n", This, aspect, size); - return E_NOTIMPL; + if (aspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + *size = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *connection) @@ -775,7 +780,9 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; + DWORD dpi_x, dpi_y; HRESULT hres; + HDC hdc; TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); @@ -789,6 +796,14 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->ref = 1; script_control->site = NULL; + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + script_control->extent.cx = MulDiv(38, 2540, dpi_x); + script_control->extent.cy = MulDiv(38, 2540, dpi_y); + hres = IScriptControl_QueryInterface(&script_control->IScriptControl_iface, riid, ppv); IScriptControl_Release(&script_control->IScriptControl_iface); return hres; diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in index 597214a..8d769d3 100644 --- a/dlls/msscript.ocx/tests/Makefile.in +++ b/dlls/msscript.ocx/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msscript.ocx -IMPORTS = ole32 +IMPORTS = user32 gdi32 ole32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7c96f99..6dd7d67 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -96,10 +96,12 @@ static IOleClientSite testclientsite = { &OleClientSiteVtbl }; static void test_oleobject(void) { + DWORD status, dpi_x, dpi_y; IOleClientSite *site; IOleObject *obj; - DWORD status; + SIZEL extent; HRESULT hr; + HDC hdc; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&obj); @@ -131,6 +133,36 @@ static void test_oleobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(site == NULL, "got %p\n", site); + /* extents */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + memset(&extent, 0, sizeof(extent)); + hr = IOleObject_GetExtent(obj, DVASPECT_CONTENT, &extent); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(extent.cx == MulDiv(38, 2540, dpi_x), "got %d\n", extent.cx); + ok(extent.cy == MulDiv(38, 2540, dpi_y), "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_THUMBNAIL, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_ICON, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_DOCPRINT, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + IOleObject_Release(obj); }

1 0

Nikolay Sivov : msscript: Added IPersistStreamInit stub.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 859d880b669a103242eeee06d6a3e6e34ccae545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859d880b669a103242eeee06d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:26 2016 +0300 msscript: Added IPersistStreamInit 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 | 98 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 14 ++++++ 2 files changed, 112 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a53266c..d525b57 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -21,6 +21,7 @@ #include "windows.h" #include "initguid.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include "msscript.h" @@ -30,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl { IScriptControl IScriptControl_iface; + IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; @@ -126,6 +128,11 @@ static inline ScriptControl *impl_from_IOleObject(IOleObject *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleObject_iface); } +static inline ScriptControl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IPersistStreamInit_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -142,6 +149,12 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleObject, riid)) { 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); + *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(&IID_IPersist, riid)) { + TRACE("(%p)->(IID_IPersist %p\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -675,6 +688,90 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *clsid) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, clsid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *stream, BOOL clear_dirty) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p %d)\n", This, stream, clear_dirty); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, ULARGE_INTEGER *size) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -687,6 +784,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow return E_OUTOFMEMORY; script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; + script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; 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 ab1c3c1..7c96f99 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -21,6 +21,7 @@ #include <initguid.h> #include <ole2.h> +#include <olectl.h> #include "msscript.h" #include "wine/test.h" @@ -133,6 +134,18 @@ static void test_oleobject(void) IOleObject_Release(obj); } +static void test_persiststreaminit(void) +{ + IPersistStreamInit *init; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistStreamInit_Release(init); +} + START_TEST(msscript) { IUnknown *unk; @@ -149,6 +162,7 @@ START_TEST(msscript) IUnknown_Release(unk); test_oleobject(); + test_persiststreaminit(); CoUninitialize(); }

1 0

Aaryaman Vasishta : d3drm/tests: Fix some missing HRESULT returns in test_frame_qi.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 431f613beb2cf5590c6d3706d5e50fea2fe876b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=431f613beb2cf5590c6d3706d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 9 03:37:29 2016 +0530 d3drm/tests: Fix some missing HRESULT returns in test_frame_qi. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f279314..5cd6a11 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2566,7 +2566,7 @@ static void test_frame_qi(void) hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1); ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr); - IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr); IDirect3DRMFrame_Release(frame1); test_qi("frame1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2576,7 +2576,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2); ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr); - IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr); IDirect3DRMFrame2_Release(frame2); test_qi("frame2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2586,7 +2586,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr); - IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr); IDirect3DRMFrame3_Release(frame3); test_qi("frame3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests));

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: a602e2f69aec83598824ae92cdebd48523203a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a602e2f69aec83598824ae92c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:37:13 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests. 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/ddraw/tests/ddraw7.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a602e2f69aec83598824a…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 7d74583e8ae420daaa73bf664763bbb0deea9009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d74583e8ae420daaa73bf664… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:35:25 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests. 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/ddraw/tests/ddraw4.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d74583e8ae420daaa73b…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
60
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 June 2016