wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Martin Storsjo : makedep: Remove an incorrect -b when creating cross import libraries.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 54d3e48448963a0ba598dd4d29bdecf59290e627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d3e48448963a0ba598dd4d… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Apr 23 00:38:16 2018 +0300 makedep: Remove an incorrect -b when creating cross import libraries. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index c9ab24d..4fc8435 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3480,7 +3480,6 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filename( "--implib" ); - output_filenames( target_flags ); output_filename( "--export" ); output_filename( spec_file ); output( "\n" );

1 0

Alexandre Julliard : testbot: Add a missing return.
by Alexandre Julliard 22 Apr '18

22 Apr '18

Module: tools Branch: master Commit: adb48711595d68dd02ed1009420f572a6a552c52 URL: https://source.winehq.org/git/tools.git/?a=commit;h=adb48711595d68dd02ed100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 22 10:10:22 2018 +0200 testbot: Add a missing return. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index ec1b450..88ecf85 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -519,7 +519,7 @@ sub SaveItem($$) { die "Internal error: Need to save new items via collection"; } - if (!$Item->GetIsModified()); + return if (!$Item->GetIsModified()); my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); my $Query = $self->BuildUpdateStatement($Item->GetTableName(),

1 0

Francois Gouget : testbot: Check $Item->{IsNew} before $Item-> {IsModified}.
by Alexandre Julliard 22 Apr '18

22 Apr '18

Module: tools Branch: master Commit: 50477068bc2a067180f1484bd923d2b6e972f8f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50477068bc2a067180f1484… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 20:02:58 2018 +0200 testbot: Check $Item->{IsNew} before $Item->{IsModified}. After creating a new item one normally modifies a number of fields. So check whether the item is new before assuming we simply need to update it just because IsModified is true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 40bfe85..ec1b450 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -515,26 +515,18 @@ sub SaveItem($$) { my ($self, $Item) = @_; - my $Query; - my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); - if ($Item->GetIsModified()) - { - $Query = $self->BuildUpdateStatement($Item->GetTableName(), - $Item->GetPropertyDescriptors(), - $MasterColNames); - } - elsif ($Item->GetIsNew()) + if ($Item->GetIsNew()) { die "Internal error: Need to save new items via collection"; } - else - { - return; - } + if (!$Item->GetIsModified()); + my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); + my $Query = $self->BuildUpdateStatement($Item->GetTableName(), + $Item->GetPropertyDescriptors(), + $MasterColNames); my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@{$self->GetUpdateData($MasterColValues, $Item)}); - $Statement->finish(); }

1 0

Francois Gouget : testbot: Import Utils in Log for DurationToString().
by Alexandre Julliard 22 Apr '18

22 Apr '18

Module: tools Branch: master Commit: 942f6853c3a4628e35389bc951aa909c29c5c098 URL: https://source.winehq.org/git/tools.git/?a=commit;h=942f6853c3a4628e35389bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 19:57:16 2018 +0200 testbot: Import Utils in Log for DurationToString(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 36efb48..2876b99 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -109,7 +109,8 @@ sub Elapsed($) sub PrettyElapsed($) { my ($Start) = @_; - return DurationToString(Time()-$Start); + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time()-$Start); } 1;

1 0

Francois Gouget : Revert "testbot/web: Tweak ItemPage to save the Item directly.".
by Alexandre Julliard 22 Apr '18

22 Apr '18

Module: tools Branch: master Commit: ed4208e634b2fa21d3a8d3580882976bb31f51d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ed4208e634b2fa21d3a8d35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 19:56:52 2018 +0200 Revert "testbot/web: Tweak ItemPage to save the Item directly.". Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the registration web page depends on that so we have no choice but to go through the collection. This reverts commit c18379abe004411ca779d4c42e26d7e7f3d72ba6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index c208aea..9b9f2ff 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,16 +134,6 @@ sub SaveProperty($$$) return 1; } -sub Save($) -{ - my ($self) = @_; - - return !1 if (!$self->SaveProperties()); - - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return ! defined($self->{ErrMessage}); -} - sub OnAction($$) { my ($self, $Action) = @_;

1 0

Jacek Caban : jscript: Remove unused prop_put arguments.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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

Jacek Caban : jscript: Remove unused prop_get arguments.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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

Piotr Caban : msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPADI@Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win64 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEAD_K@Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA -@ stub ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ +@ cdecl ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ() _Task_impl_base__IsNonBlockingThread @ cdecl -arch=win32 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor@_Locimp@locale@std@@CAXPAV123@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@_Task_impl_base@details@Concurrency@@SA_NXZ"); SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA@_ContextCallback@details@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@_Task_impl_base@details@Concurrency@@SA_NXZ */ +MSVCP_bool __cdecl _Task_impl_base__IsNonBlockingThread(void) +{ + FIXME("() stub\n"); + return FALSE; +} +#endif

1 0

Francois Gouget : mshtml: Make set_frame_doc() static.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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

Anton Romanov : wmp: IWMPSettings implement put/get volume.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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

← Newer
1
...
14
15
16
17
18
19
20
...
55
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 April 2018