February 2018 - Wine-commits

Hans Leidekker : wldap32: Use the global memory allocation helpers.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 7de7f9af9fca72498f2be379b812644a1558d878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de7f9af9fca72498f2be379… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:10 2018 +0100 wldap32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 3 +- dlls/wldap32/init.c | 19 +++--- dlls/wldap32/page.c | 8 +-- dlls/wldap32/value.c | 10 ++- dlls/wldap32/wldap32.h | 175 ++++++++++++++++++------------------------------- 5 files changed, 81 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7de7f9af9fca72498f2b…

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLDocument2:: elementFromPoint implementation.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 567f911fcf95993d0fb1d6e8cf1f3d4d163ae3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=567f911fcf95993d0fb1d6e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:24:51 2018 +0100 mshtml: Use get_element helper in IHTMLDocument2::elementFromPoint implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0fc96a5..ec4771d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1594,11 +1594,11 @@ static HRESULT WINAPI HTMLDocument_get_onselectstart(IHTMLDocument2 *iface, VARI } static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG x, LONG y, - IHTMLElement **elementHit) + IHTMLElement **elementHit) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMElement *nselem; - HTMLDOMNode *node; + HTMLElement *element; nsresult nsres; HRESULT hres; @@ -1615,14 +1615,13 @@ static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG return S_OK; } - hres = get_node((nsIDOMNode*)nselem, TRUE, &node); + hres = get_element(nselem, &element); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)elementHit); - node_release(node); - return hres; + *elementHit = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTMLWindow2 **p)

1 0

Francois Gouget : testbot: Add the $MaxRunningVMs limit.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: tools Branch: master Commit: 6a9898fcced3306d465b0e0458b36b04682bb7dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a9898fcced3306d465b0e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 20 18:30:47 2018 +0100 testbot: Add the $MaxRunningVMs limit. This allows preparing up to $MaxActiveVMs idle VMs while putting a lower limit on the number of simultaneously running tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++++++ testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7e278ba..2e62c66 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -736,6 +736,12 @@ sub main() # Validate and adjust the configuration options $MaxActiveVMs ||= 1; + $MaxRunningVMs ||= $MaxActiveVMs; + if ($MaxRunningVMs > $MaxActiveVMs) + { + $MaxRunningVMs = $MaxActiveVMs; + LogMsg "Capping MaxRunningVMs to MaxActiveVMs ($MaxRunningVMs)\n"; + } $MaxRevertingVMs ||= $MaxActiveVMs; if ($MaxRevertingVMs > $MaxActiveVMs) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 76bc4eb..02c9dac 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -27,7 +27,8 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs - $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxVMsWhenIdle + $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs + $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout @@ -42,7 +43,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout @@ -69,6 +70,7 @@ $BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; +$MaxRunningVMs = 1; $MaxVMsWhenIdle = undef; # How long to wait for each of the 3 connection attempts to the VM's TestAgent diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 9a0f8bc..b71073a 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -473,6 +473,7 @@ sub _GetSchedHost($$) MaxRevertingVMs => $MaxRevertingVMs, MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, MaxActiveVMs => $MaxActiveVMs, + MaxRunningVMs => $MaxRunningVMs, MaxVMsWhenIdle => $MaxVMsWhenIdle, }; } @@ -905,7 +906,11 @@ sub _ScheduleTasks($) delete $Sched->{lambvms}->{$VMKey}; my $Host = _GetSchedHost($Sched, $VM); - if ($Host->{active} - $Host->{idle} < $Host->{MaxActiveVMs} and + # Dirty VMs are VMs that were running and have still not been + # powered off. Sleeping VMs may be VMs that are booting. + # So in both cases they may still be using CPU and I/O resources so + # count them against the running VM limit. + if ($Host->{sleeping} + $Host->{running} + $Host->{dirty} < $Host->{MaxRunningVMs} and ($Host->{reverting} == 0 or $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs})) {

1 0

Rosanne DiMesio : Disable staging checkbox for new test reports
by Jeremy Newman 19 Feb '18

19 Feb '18

Module: appdb Branch: master Commit: 6150f43320843dd39da749437a7d73a9374a609e URL: https://source.winehq.org/git/appdb.git/?a=commit;h=6150f43320843dd39da7494… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Feb 19 11:35:36 2018 -0600 Disable staging checkbox for new test reports Prevents users from submitting new test reports for nonexistant staging versions. Current data is retained and the checkbox is still active for existing reports in case they need to be edited by an admin or maintainer. This change can be easily reverted if the branch is officially revived by WineHQ. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1083cfb..cec7fec 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,11 +921,14 @@ class testData{ echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; + if($this->sState != 'accepted') + echo '<input type="checkbox" name="iStaging" value="1" disabled>'; else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging <i>(discontinued; last official release was 2.21)</i>'; echo '</label>'; echo '</td></tr>',"\n";

1 0

Alexandre Julliard : kernel32: Hardcode the windows and system directories.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 59a7777f8494d909b9366015157d8be4ef1edb46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a7777f8494d909b9366015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:45:58 2018 +0100 kernel32: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/process.c | 50 ++++++------------------------------------ 2 files changed, 9 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 1af11f5..6f60413 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -55,8 +55,8 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; -extern const WCHAR *DIR_Windows DECLSPEC_HIDDEN; -extern const WCHAR *DIR_System DECLSPEC_HIDDEN; +extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; +extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; extern const WCHAR *DIR_SysWow64 DECLSPEC_HIDDEN; extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bbadae0..0a3fd70 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -64,7 +64,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(process); -WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ @@ -90,8 +89,9 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -const WCHAR *DIR_Windows = NULL; -const WCHAR *DIR_System = NULL; +const WCHAR DIR_Windows[] = {'C',':','\\','w','i','n','d','o','w','s',0}; +const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','t','e','m','3','2',0}; const WCHAR *DIR_SysWow64 = NULL; /* Process flags */ @@ -954,41 +954,12 @@ done: /*********************************************************************** * init_windows_dirs * - * Initialize the windows and system directories from the environment. + * Create the windows and system directories if necessary. */ static void init_windows_dirs(void) { - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; - static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; - static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; - static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; - static const WCHAR default_syswow64W[] = {'\\','s','y','s','w','o','w','6','4',0}; - - DWORD len; - WCHAR *buffer; - - if ((len = GetEnvironmentVariableW( windirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( windirW, buffer, len ); - DIR_Windows = buffer; - } - else DIR_Windows = default_windirW; - - if ((len = GetEnvironmentVariableW( winsysdirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( winsysdirW, buffer, len ); - DIR_System = buffer; - } - else - { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_sysdirW) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_sysdirW, sizeof(default_sysdirW) ); - DIR_System = buffer; - } + static const WCHAR default_syswow64W[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','w','o','w','6','4',0}; if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", @@ -999,18 +970,11 @@ static void init_windows_dirs(void) if (is_win64 || is_wow64) /* SysWow64 is always defined on 64-bit */ { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); - DIR_SysWow64 = buffer; + DIR_SysWow64 = default_syswow64W; if (!CreateDirectoryW( DIR_SysWow64, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_SysWow64), GetLastError() ); } - - TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); - TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); }

1 0

Sebastian Lackner : user.exe16: Don't open code CONTAINING_RECORD.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 538263d0efe725124df88ce1cce124bc3ad7e2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=538263d0efe725124df88ce1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 19 20:56:02 2018 +0300 user.exe16: Don't open code CONTAINING_RECORD. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f7d4109..27b9279 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -87,10 +87,7 @@ static BOOL CALLBACK gray_string_callback( HDC hdc, LPARAM param, INT len ) /* callback for 16-bit gray string proc with string pointer */ static BOOL CALLBACK gray_string_callback_ptr( HDC hdc, LPARAM param, INT len ) { - const struct gray_string_info *info; - char *str = (char *)param; - - info = (struct gray_string_info *)(str - offsetof( struct gray_string_info, str )); + const struct gray_string_info *info = CONTAINING_RECORD( (void *)param, struct gray_string_info, str ); return gray_string_callback( hdc, (LPARAM)info, len ); }

1 0

Anton Romanov : wmp: Add IWMPControls stub implementation.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: b5aff992338215ab1b71460a7e994830886d51dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5aff992338215ab1b71460a… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sun Feb 18 23:31:25 2018 -0800 wmp: Add IWMPControls stub implementation. 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 | 213 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 13 +++ dlls/wmp/wmp_private.h | 1 + 3 files changed, 225 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index accf540..e40422d 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -32,6 +32,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPControls(IWMPControls *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPControls_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -121,8 +126,12 @@ static HRESULT WINAPI WMPPlayer4_get_playState(IWMPPlayer4 *iface, WMPPlayState static HRESULT WINAPI WMPPlayer4_get_controls(IWMPPlayer4 *iface, IWMPControls **ppControl) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppControl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppControl); + + IWMPControls_AddRef(&This->IWMPControls_iface); + *ppControl = &This->IWMPControls_iface; + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings **ppSettings) @@ -931,9 +940,209 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; +HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + *ppv = iface; + }else { + WARN("Unsupported interface (%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPControls_AddRef(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI WMPControls_Release(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI WMPControls_GetTypeInfoCount(IWMPControls *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_play(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pdCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%f)\n", This, dCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_next(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, ppIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, plMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d)\n", This, lMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +static const IWMPControlsVtbl WMPControlsVtbl = { + WMPControls_QueryInterface, + WMPControls_AddRef, + WMPControls_Release, + WMPControls_GetTypeInfoCount, + WMPControls_GetTypeInfo, + WMPControls_GetIDsOfNames, + WMPControls_Invoke, + WMPControls_get_isAvailable, + WMPControls_play, + WMPControls_stop, + WMPControls_pause, + WMPControls_fastForward, + WMPControls_fastReverse, + WMPControls_get_currentPosition, + WMPControls_put_currentPosition, + WMPControls_get_currentPositionString, + WMPControls_next, + WMPControls_previous, + WMPControls_get_currentItem, + WMPControls_put_currentItem, + WMPControls_get_currentMarker, + WMPControls_put_currentMarker, + WMPControls_playItem, +}; + void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; + wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 46b0b72..a004337 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -859,11 +859,24 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPControls *controls; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + player = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); + ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(player == NULL, "player != NULL\n"); + + IWMPControls_Release(controls); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 710793c..65de6bb 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,6 +44,7 @@ struct WindowsMediaPlayer { IWMPPlayer4 IWMPPlayer4_iface; IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; + IWMPControls IWMPControls_iface; LONG ref;

1 0

Jacek Caban : mshtml: Get owner document from Gecko node in get_node.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 23b1d3a79df224f14f39278731477ff3ee86f194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b1d3a79df224f14f392787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:44 2018 +0100 mshtml: Get owner document from Gecko node in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++++ dlls/mshtml/htmlnode.c | 18 +++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 174ef20..a4e281b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5205,6 +5205,25 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do return S_OK; } +HRESULT get_document_node(nsIDOMDocument *dom_document, HTMLDocumentNode **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(NULL, (nsIDOMNode*)dom_document, FALSE, &node); + if(FAILED(hres)) + return hres; + + if(!node) { + ERR("document not initialized\n"); + return E_FAIL; + } + + assert(node->vtbl == &HTMLDocumentNodeImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0aad491..44983bc 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1616,8 +1616,11 @@ void init_node_cc(void) HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { + nsIDOMDocument *dom_document; + HTMLDocumentNode *document; nsISupports *unk = NULL; nsresult nsres; + HRESULT hres; nsres = nsIDOMNode_GetMshtmlNode(nsnode, &unk); assert(nsres == NS_OK); @@ -1633,5 +1636,18 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - return create_node(This, nsnode, ret); + nsres = nsIDOMNode_GetOwnerDocument(nsnode, &dom_document); + if(NS_FAILED(nsres) || !dom_document) { + ERR("GetOwnerDocument failed: %08x\n", nsres); + return E_FAIL; + } + + hres = get_document_node(dom_document, &document); + nsIDOMDocument_Release(dom_document); + if(!document) + return E_FAIL; + + hres = create_node(document, nsnode, ret); + htmldoc_release(&document->basedoc); + return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index de200cf..cd5b9c3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1074,6 +1074,7 @@ void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml/tests: Added more ownerDocument property tests.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 7586334008364935ac3c8cc2699474cf7e859ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7586334008364935ac3c8cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:54 2018 +0100 mshtml/tests: Added more ownerDocument property tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index a16194f..089d356 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -187,6 +187,27 @@ function test_compare_position() { next_test(); } +function test_document_owner() { + var node; + + ok(document.ownerDocument === null, "ownerDocument = " + document.ownerDocument); + ok(document.body.ownerDocument === document, + "body.ownerDocument = " + document.body.ownerDocument); + ok(document.documentElement.ownerDocument === document, + "documentElement.ownerDocument = " + document.documentElement.ownerDocument); + + node = document.createElement("test"); + ok(node.ownerDocument === document, "element.ownerDocument = " + node.ownerDocument); + + node = document.createDocumentFragment("test"); + ok(node.ownerDocument === document, "fragment.ownerDocument = " + node.ownerDocument); + + node = document.createTextNode("test"); + ok(node.ownerDocument === document, "text.ownerDocument = " + node.ownerDocument); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -195,5 +216,6 @@ var tests = [ test_head, test_iframe, test_query_selector, - test_compare_position + test_compare_position, + test_document_owner ];

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument in get_node.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 69af9a4c9d82a4ea9ffe36ccc3ed10dcbda01138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69af9a4c9d82a4ea9ffe36cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:07 2018 +0100 mshtml: Get rid of no longer needed document argument in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 9 ++++----- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 24 ++++++++++++------------ dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/npplugin.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 18 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69af9a4c9d82a4ea9ffe…

1 0