April 2018 - Wine-Commits - list.winehq.org

Anton Romanov : wmp: Stub IWMPNetwork get download/buffering progress.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 6e2c61187098bb1cab3b785855074efc39aba59f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2c61187098bb1cab3b7858… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Apr 19 22:45:31 2018 -0700 wmp: Stub IWMPNetwork get download/buffering progress. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 27 +++++++++++++++++++++++---- dlls/wmp/tests/media.c | 16 ++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 0a6d598..df395cb 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1150,8 +1150,17 @@ static HRESULT WINAPI WMPNetwork_get_bufferingCount(IWMPNetwork *iface, LONG *pl static HRESULT WINAPI WMPNetwork_get_bufferingProgress(IWMPNetwork *iface, LONG *plBufferingProgress) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%p)\n", This, plBufferingProgress); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, plBufferingProgress); + if (!This->filter_graph) { + return S_FALSE; + } + /* Ideally we would use IAMOpenProgress for URL reader but we don't have it in wine (yet) + * For file sources FileAsyncReader->Length should work + * */ + FIXME("stub: Returning buffering progress 100\n"); + *plBufferingProgress = 100; + + return S_OK; } static HRESULT WINAPI WMPNetwork_get_bufferingTime(IWMPNetwork *iface, LONG *plBufferingTime) @@ -1276,8 +1285,18 @@ static HRESULT WINAPI WMPNetwork_put_maxBandwidth(IWMPNetwork *iface, LONG lMaxB static HRESULT WINAPI WMPNetwork_get_downloadProgress(IWMPNetwork *iface, LONG *plDownloadProgress) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%p)\n", This, plDownloadProgress); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, plDownloadProgress); + if (!This->filter_graph) { + return S_FALSE; + } + /* Ideally we would use IAMOpenProgress for URL reader but we don't have it in wine (yet) + * For file sources FileAsyncReader->Length could work or it should just be + * 100 + * */ + FIXME("stub: Returning download progress 100\n"); + *plDownloadProgress = 100; + + return S_OK; } static HRESULT WINAPI WMPNetwork_get_encodedFrameRate(IWMPNetwork *iface, LONG *plFrameRate) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 2372763..fbbd329 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,8 +303,10 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + IWMPNetwork *network; DOUBLE duration; VARIANT_BOOL vbool; + LONG progress; IWMPMedia *media; static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; BSTR bstrcurrentPosition = SysAllocString(currentPosition); @@ -416,6 +418,20 @@ static BOOL test_wmp(void) ok(round(duration) == 3, "unexpected value: %f\n", duration); IWMPMedia_Release(media); + network = NULL; + hres = IWMPPlayer4_get_network(player4, &network); + ok(hres == S_OK, "get_network failed: %08x\n", hres); + ok(network != NULL, "network = NULL\n"); + progress = 0; + hres = IWMPNetwork_get_bufferingProgress(network, &progress); + ok(hres == S_OK || broken(hres == S_FALSE), "IWMPNetwork_get_bufferingProgress failed: %08x\n", hres); + ok(progress == 100, "unexpected value: %d\n", progress); + progress = 0; + hres = IWMPNetwork_get_downloadProgress(network, &progress); + ok(hres == S_OK, "IWMPNetwork_get_downloadProgress failed: %08x\n", hres); + ok(progress == 100, "unexpected value: %d\n", progress); + IWMPNetwork_Release(network); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia);

1 0

Anton Romanov : wmp: IWMPSettings implement put/get volume.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 5d26d0b2c84b987ced9f55cfb0daa51bab8c5974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d26d0b2c84b987ced9f55cf… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Apr 19 22:45:32 2018 -0700 wmp: IWMPSettings implement put/get volume. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 29 +++++++++++++++++++++++++---- dlls/wmp/tests/media.c | 17 ++++++++++++++++- dlls/wmp/wmp_private.h | 2 ++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index df395cb..97fd66b 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -958,15 +958,27 @@ static HRESULT WINAPI WMPSettings_put_balance(IWMPSettings *iface, LONG v) static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + if (!p) + return E_POINTER; + *p = This->volume; + return S_OK; } static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, v); + This->volume = v; + if (!This->filter_graph) { + hres = S_OK; + } else { + /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ + v = 10000 * v / 100 - 10000; + hres = IBasicAudio_put_Volume(This->basic_audio, v); + } + return hres; } static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p) @@ -1484,6 +1496,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) IMediaEventEx_Release(media_event_ex); } } + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IBasicAudio, (void**)&This->basic_audio); + if (SUCCEEDED(hres)) + hres = IWMPSettings_put_volume(&This->IWMPSettings_iface, This->volume); } update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsTransitioning); @@ -1525,11 +1541,15 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_seeking) { IMediaSeeking_Release(This->media_seeking); } + if (This->basic_audio) { + IBasicAudio_Release(This->basic_audio); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; This->media_seeking = NULL; + This->basic_audio = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1983,6 +2003,7 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; + wmp->volume = 100; return TRUE; } diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index fbbd329..3fd74ad 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -338,7 +338,6 @@ static BOOL test_wmp(void) hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); - IWMPSettings_Release(settings); controls = NULL; hres = IWMPPlayer4_get_controls(player4, &controls); @@ -352,6 +351,12 @@ static BOOL test_wmp(void) hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + hres = IWMPSettings_put_volume(settings, 36); + ok(hres == S_OK, "IWMPSettings_put_volume failed: %08x\n", hres); + hres = IWMPSettings_get_volume(settings, &progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); + ok(progress == 36, "unexpected value: %d\n", progress); + filename = SysAllocString(load_resource(mp3file)); SET_EXPECT(OPENSTATE, wmposPlaylistChanging); @@ -460,7 +465,17 @@ playback_skip: hres = IConnectionPoint_Unadvise(point, dw); ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + hres = IWMPSettings_get_volume(settings, &progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); + ok(progress == 36, "unexpected value: %d\n", progress); + hres = IWMPSettings_put_volume(settings, 99); + ok(hres == S_OK, "IWMPSettings_put_volume failed: %08x\n", hres); + hres = IWMPSettings_get_volume(settings, &progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); + ok(progress == 99, "unexpected value: %d\n", progress); + IConnectionPoint_Release(point); + IWMPSettings_Release(settings); IWMPControls_Release(controls); IWMPPlayer4_Release(player4); IOleObject_Release(oleobj); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e8d5348..b0861dd 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -69,6 +69,7 @@ struct WindowsMediaPlayer { VARIANT_BOOL auto_start; VARIANT_BOOL invoke_urls; VARIANT_BOOL enable_error_dialogs; + LONG volume; ConnectionPoint *wmpocx; @@ -79,6 +80,7 @@ struct WindowsMediaPlayer { IMediaControl* media_control; IMediaEvent* media_event; IMediaSeeking* media_seeking; + IBasicAudio* basic_audio; /* Async event notification */ HWND msg_window;

1 0

Piotr Caban : msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: a2d618ef22da3485a200f34e19ffbeace8fd5da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d618ef22da3485a200f34e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 20 17:35:48 2018 +0200 msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 8 ++++++++ dlls/msvcp90/misc.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ddf8ba7..03bc617 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1443,7 +1443,7 @@ @ cdecl -arch=win32 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPADI(a)Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA -@ stub ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ +@ cdecl ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ() _Task_impl_base__IsNonBlockingThread @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 620e931..593e0ce 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -149,6 +149,7 @@ enum file_type { }; static unsigned int (__cdecl *p__Thrd_id)(void); +static MSVCP_bool (__cdecl *p__Task_impl_base__IsNonBlockingThread)(void); static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static void (__thiscall *p__ContextCallback__Assign)(_ContextCallback*, void*); static void (__thiscall *p__ContextCallback__CallInContext)(const _ContextCallback*, function_void_cdecl_void, MSVCP_bool); @@ -198,6 +199,7 @@ static BOOL init(void) } SET(p__Thrd_id, "_Thrd_id"); + SET(p__Task_impl_base__IsNonBlockingThread, "?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ"); SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -276,6 +278,11 @@ static void test_thrd(void) p__Thrd_id(), GetCurrentThreadId()); } +static void test__Task_impl_base__IsNonBlockingThread(void) +{ + ok(!p__Task_impl_base__IsNonBlockingThread(), "_IsNonBlockingThread() returned true\n"); +} + static struct { int value[2]; const char* export_name; @@ -1058,6 +1065,7 @@ START_TEST(msvcp140) { if(!init()) return; test_thrd(); + test__Task_impl_base__IsNonBlockingThread(); test_vbtable_size_exports(); test_task_continuation_context(); test__ContextCallback(); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a56389c..d9e01d4 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2142,3 +2142,12 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4* throw_exception(exceptions[idx].type, exceptions[idx].msg); } #endif + +#if _MSVCP_VER >= 140 +/* ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ */ +MSVCP_bool __cdecl _Task_impl_base__IsNonBlockingThread(void) +{ + FIXME("() stub\n"); + return FALSE; +} +#endif

1 0

Jacek Caban : jscript: Remove unused prop_put arguments.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: a373054b72f396a04ab4f191e1f6c2c9e0476aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a373054b72f396a04ab4f191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 18:33:16 2018 +0200 jscript: Remove unused prop_put arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d10c7d4..81df4d0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -466,7 +466,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) return hres; } -static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServiceProvider *caller) +static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) { HRESULT hres; @@ -728,7 +728,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(FAILED(hres)) return hres; - hres = prop_put(This, prop, val, pspCaller); + hres = prop_put(This, prop, val); jsval_release(val); break; } @@ -1302,7 +1302,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va if(FAILED(hres)) return hres; - return prop_put(obj, prop, val, NULL); + return prop_put(obj, prop, val); } HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) @@ -1348,7 +1348,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) prop = get_prop(jsdisp, id); if(prop) - hres = prop_put(jsdisp, prop, val, NULL); + hres = prop_put(jsdisp, prop, val); else hres = DISP_E_MEMBERNOTFOUND;

1 0

Francois Gouget : mshtml: Make set_frame_doc() static.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 4121ac052bea1e226798101aefc6f584eec7a3d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4121ac052bea1e226798101a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:25:10 2018 +0200 mshtml: Make set_frame_doc() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e4a7a61..17a78e5 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -39,7 +39,7 @@ static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; static const WCHAR pxW[] = {'p','x',0}; -HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) +static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { mozIDOMWindowProxy *mozwindow; HTMLOuterWindow *window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ff52dae..0a4dfba 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -922,8 +922,6 @@ void init_node_cc(void) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; - void call_property_onchanged(ConnectionPointContainer*,DISPID) DECLSPEC_HIDDEN; HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : shell32: Add 256x256 variants of the standard icons.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: e8976ceeab3b8da266ec9b16e8cae8598d1231dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8976ceeab3b8da266ec9b16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 17:17:10 2018 +0200 shell32: Add 256x256 variants of the standard icons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cdrom.ico | Bin 25214 -> 36364 bytes dlls/shell32/cdrom.svg | 1182 ++++++++++++++++++++--- dlls/shell32/control.ico | Bin 25214 -> 45698 bytes dlls/shell32/control.svg | 2125 +++++++++++++++++++++++++++++++++++++----- dlls/shell32/delete.ico | Bin 13942 -> 55048 bytes dlls/shell32/delete.svg | 2047 +++++++++++++++++++++++++++++++++++----- dlls/shell32/desktop.ico | Bin 25214 -> 37129 bytes dlls/shell32/desktop.svg | 730 +++++++++++++-- dlls/shell32/document.ico | Bin 25214 -> 31561 bytes dlls/shell32/document.svg | 1224 +++++++++++++++++++++--- dlls/shell32/drive.ico | Bin 25214 -> 34754 bytes dlls/shell32/drive.svg | 1133 +++++++++++++++++++--- dlls/shell32/floppy.ico | Bin 25214 -> 32373 bytes dlls/shell32/floppy.svg | 853 ++++++++++++++--- dlls/shell32/folder.ico | Bin 25214 -> 37009 bytes dlls/shell32/folder.svg | 1007 +++++++++++++++++--- dlls/shell32/folder_open.ico | Bin 25214 -> 38165 bytes dlls/shell32/folder_open.svg | 1095 +++++++++++++++++++--- dlls/shell32/mycomputer.ico | Bin 25214 -> 50754 bytes dlls/shell32/mycomputer.svg | 854 +++++++++++------ dlls/shell32/mydocs.ico | Bin 25214 -> 39112 bytes dlls/shell32/mydocs.svg | 1693 +++++++++++++++++++++++++++++---- dlls/shell32/netdrive.ico | Bin 25214 -> 37244 bytes dlls/shell32/netdrive.svg | 1757 +++++++++++++++++++++++++++++----- dlls/shell32/netdrive2.ico | Bin 25214 -> 43380 bytes dlls/shell32/netdrive2.svg | 1861 +++++++++++++++++++++++++++++++----- dlls/shell32/printer.ico | Bin 25214 -> 35182 bytes dlls/shell32/printer.svg | 1222 +++++++++++++++++++++--- dlls/shell32/ramdisk.ico | Bin 25470 -> 36262 bytes dlls/shell32/ramdisk.svg | 1704 ++++++++++++++++++++++++++++++--- dlls/shell32/shortcut.ico | Bin 25214 -> 29643 bytes dlls/shell32/shortcut.svg | 287 +++++- dlls/shell32/trash_file.ico | Bin 25214 -> 48203 bytes dlls/shell32/trash_file.svg | 1024 +++++++++++++++++--- 34 files changed, 19073 insertions(+), 2725 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8976ceeab3b8da266ec…

1 0

Alexandre Julliard : user32: Add 256x256 variants of the standard icons.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: ecf0bef5613c379e80e40a47f32ee27c58f42443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf0bef5613c379e80e40a47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 17:16:51 2018 +0200 user32: Add 256x256 variants of the standard icons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/oic_bang.ico | Bin 25214 -> 41061 bytes dlls/user32/resources/oic_bang.svg | 452 ++++++++++- dlls/user32/resources/oic_hand.ico | Bin 25214 -> 48346 bytes dlls/user32/resources/oic_hand.svg | 549 +++++++++++-- dlls/user32/resources/oic_note.ico | Bin 25214 -> 47823 bytes dlls/user32/resources/oic_note.svg | 430 ++++++++-- dlls/user32/resources/oic_ques.ico | Bin 25214 -> 47818 bytes dlls/user32/resources/oic_ques.svg | 453 +++++++++-- dlls/user32/resources/oic_sample.ico | Bin 25214 -> 28310 bytes dlls/user32/resources/oic_sample.svg | 551 +++++++++++-- dlls/user32/resources/oic_shield.ico | Bin 34494 -> 57805 bytes dlls/user32/resources/oic_shield.svg | 246 ++++-- dlls/user32/resources/oic_winlogo.ico | Bin 25214 -> 48230 bytes dlls/user32/resources/oic_winlogo.svg | 1435 ++++++++++++++++++++++++++++----- 14 files changed, 3570 insertions(+), 546 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecf0bef5613c379e80e4…

1 0

Dmitry Timoshkov : mstask: ITask::GetErrorRetryInterval() is not implemented.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 9d113d353b8c7c0d288c640d45889ecb31dfa72a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d113d353b8c7c0d288c640d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:15 2018 +0800 mstask: ITask::GetErrorRetryInterval() is not implemented. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++---- dlls/mstask/tests/task.c | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 26cefcd..3f68afb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -400,11 +400,9 @@ static HRESULT WINAPI MSTASK_ITask_SetErrorRetryInterval( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval( - ITask* iface, - WORD *pwRetryInterval) +static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *interval) { - FIXME("(%p, %p): stub\n", iface, pwRetryInterval); + TRACE("(%p, %p)\n", iface, interval); return E_NOTIMPL; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 3739db0..5256424 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -541,6 +541,12 @@ static void test_task_state(void) hr = ITask_GetErrorRetryCount(test_task, &val1); ok(hr == E_NOTIMPL, "got %#x\n", hr); + if (0) /* crashes under Windows */ + hr = ITask_GetErrorRetryInterval(test_task, NULL); + + hr = ITask_GetErrorRetryInterval(test_task, &val1); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + cleanup_task(); }

1 0

Dmitry Timoshkov : mstask: Implement better stub for ITask:: GetMostRecentRunTime().
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: be8a21f136d236452727e191788d34920c796125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8a21f136d236452727e191… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:27 2018 +0800 mstask: Implement better stub for ITask::GetMostRecentRunTime(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0ef65..19bd919 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -225,12 +225,12 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime( - ITask* iface, - SYSTEMTIME *pstLastRun) +static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, pstLastRun); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, st); + + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6184604..6e3c997 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -503,6 +503,7 @@ static void test_task_state(void) HRESULT hr, status; DWORD flags, val; WORD val1, val2; + SYSTEMTIME st; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -573,6 +574,19 @@ static void test_task_state(void) ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); ok(val == 0, "got %#x\n", val); + if (0) /* crashes under Windows */ + hr = ITask_GetMostRecentRunTime(test_task, NULL); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetMostRecentRunTime(test_task, &st); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(st.wYear == 0, "got %u\n", st.wYear); + ok(st.wMonth == 0, "got %u\n", st.wMonth); + ok(st.wDay == 0, "got %u\n", st.wDay); + ok(st.wHour == 0, "got %u\n", st.wHour); + ok(st.wMinute == 0, "got %u\n", st.wMinute); + ok(st.wSecond == 0, "got %u\n", st.wSecond); + cleanup_task(); }

1 0

Jacek Caban : jscript: Remove unused prop_get arguments.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 23e4a530c59a64f1844764f3eacc1425ac1e2e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e4a530c59a64f1844764f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 18:33:09 2018 +0200 jscript: Remove unused prop_get arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ffb351e..d10c7d4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -419,8 +419,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t return E_FAIL; } -static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp, - jsval_t *r, IServiceProvider *caller) +static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) { HRESULT hres; @@ -445,7 +444,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp, } break; case PROP_PROTREF: - hres = prop_get(This->prototype, This->prototype->props+prop->u.ref, dp, r, caller); + hres = prop_get(This->prototype, This->prototype->props + prop->u.ref, r); break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); @@ -704,7 +703,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: { jsval_t r; - hres = prop_get(This, prop, pdp, &r, pspCaller); + hres = prop_get(This, prop, &r); if(SUCCEEDED(hres)) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); @@ -1005,7 +1004,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { jsval_t val; - hres = prop_get(constr, prop, NULL, &val, NULL); + hres = prop_get(constr, prop, &val); if(FAILED(hres)) { ERR("Could not get prototype\n"); return hres; @@ -1389,7 +1388,6 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) { - DISPPARAMS dp = {NULL, NULL, 0, 0}; dispex_prop_t *prop; HRESULT hres; @@ -1402,13 +1400,12 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) return S_OK; } - return prop_get(obj, prop, &dp, val, NULL); + return prop_get(obj, prop, val); } HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) { WCHAR name[12]; - DISPPARAMS dp = {NULL, NULL, 0, 0}; dispex_prop_t *prop; HRESULT hres; @@ -1425,19 +1422,18 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) return DISP_E_UNKNOWNNAME; } - return prop_get(obj, prop, &dp, r, NULL); + return prop_get(obj, prop, r); } HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) { - DISPPARAMS dp = {NULL,NULL,0,0}; dispex_prop_t *prop; prop = get_prop(jsdisp, id); if(!prop) return DISP_E_MEMBERNOTFOUND; - return prop_get(jsdisp, prop, &dp, val, NULL); + return prop_get(jsdisp, prop, val); } HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val)

1 0