March 2014 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Use a keepalive to detect when the tasks crashed their VM and network outages.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: tools Branch: master Commit: 6aaf098a6f618e42d3ede485f3e1d802888ceb38 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6aaf098a6f618e42d3ede485… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 11 11:48:20 2014 +0100 testbot: Use a keepalive to detect when the tasks crashed their VM and network outages. --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 98a9211..e8561c9 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -254,7 +254,7 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); -if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = $TA->GetLastError(); # Try to grab the build log before reporting the failure diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0728a0b..562b9d1 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -220,7 +220,7 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); -if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = $TA->GetLastError(); # Try to grab the reconfig log before reporting the failure diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3b5c17e..ce1adb5 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -257,6 +257,7 @@ if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) $FullErrFileName, $Job, $Step, $Task; } +my $Keepalive; my $Timeout = $Task->Timeout; my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; @@ -270,6 +271,7 @@ if ($Step->Type eq "single") # Add 1 second to the timeout so the client-side Wait() does not time out # right before $TestLauncher does. $Timeout += 1; + $Keepalive = 20; my $CmdLineArg = $Task->CmdLineArg; if ($CmdLineArg) { @@ -279,6 +281,7 @@ if ($Step->Type eq "single") } elsif ($Step->Type eq "suite") { + $Keepalive = 60; $Script .= "$FileName "; my $Tag = lc($TagPrefix) . "-" . lc($VM->Name); $Tag =~ s/[^a-zA-Z0-9]/-/g; @@ -317,7 +320,7 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) } my $Pid = $TA->Run(["./script.bat"], 0); -if (!$Pid or !defined $TA->Wait($Pid, $Timeout)) +if (!$Pid or !defined $TA->Wait($Pid, $Timeout, $Keepalive)) { $ErrMessage = "Failure running script in VM: " . $TA->GetLastError(); }

1 0

Francois Gouget : testbot/TestAgent: Add a keepalive parameter to Wait().
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: tools Branch: master Commit: bc8e06b83fe8602a3c5e53f54af6edb1382aa41a URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc8e06b83fe8602a3c5e53f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 11 11:46:24 2014 +0100 testbot/TestAgent: Add a keepalive parameter to Wait(). This makes it possible to detect when the remote end crashes, freezes or is no longer reachable due to a network outage. Also increase the leeway added to account for network transmission delays: 1 second is just too short. --- testbot/lib/WineTestBot/TestAgent.pm | 79 ++++++++++++++++++++++++++-------- testbot/scripts/TestAgent | 18 +++++--- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 299f63e..f313984 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1100,40 +1100,83 @@ sub Run($$$;$$$) return $self->_RecvList('Q'); } -sub Wait($$$) +=pod +=over 12 + +=item C<Wait()> + +Waits at most Timeout seconds for the specified remote process to terminate. +The Keepalive specifies how often, in seconds, to check that the remote end +is still alive and reachable. + +=back +=cut + +sub Wait($$$;$) { - my ($self, $Pid, $Timeout) = @_; - debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", "\n"); - # Add 1 second for the reply to come back - my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); + my ($self, $Pid, $Timeout, $Keepalive) = @_; + debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", ", ", + defined $Keepalive ? $Keepalive : "<undef>", "\n"); # Make sure we have the server version return undef if (!$self->{agentversion} and !$self->_Connect()); - # Send the command + my ($OldTimeout, $Result); if ($self->{agentversion} =~ / 1\.0$/) { - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize(1) or - !$self->_SendUInt64($Pid)) - { - return undef; - } + # Add a 5 second leeway to take into account network transmission delays + $OldTimeout = $self->SetTimeout($Timeout + 5) if ($Timeout); + + # Send the command + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize(1) or + !$self->_SendUInt64($Pid)) + { + last; + } + + # Get the reply + $Result = $self->_RecvList('I'); } else { + $Keepalive ||= 0xffffffff; + $OldTimeout = $self->{timeout}; + + my $Deadline; + $Deadline = time() + $Timeout if ($Timeout); + while (1) + { + my $Remaining = $Keepalive; + if ($Deadline) + { + $Remaining = $Deadline - time(); + last if ($Remaining < 0); + $Remaining = $Keepalive if ($Keepalive < $Remaining); + } + # Add a 5 second leeway to take into account network transmission delays + $self->SetTimeout($Remaining + 5); + + # Send the command if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize(2) or !$self->_SendUInt64($Pid) or - !$self->_SendUInt32(defined $Timeout ? $Timeout : 0xffffffff)) + !$self->_SendUInt32($Remaining)) { - return undef; + last; } - } - # Get the reply - my $Result = $self->_RecvList('I'); - $self->SetTimeout($OldTimeout) if ($Timeout); + # Get the reply + $Result = $self->_RecvList('I'); + + # The process has quit + last if (defined $Result); + + # Retry only if the timeout occurred on the remote end + last if ($self->{err} !~ /timed out waiting/); + } + } + $self->SetTimeout($OldTimeout); return $Result; } diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 30e2fbc..4fa8f4f 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -3,7 +3,7 @@ # This is a testagentd client. It can be used to exchange files or run # commands on the testagentd server, mostly for testing purposes. # -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -56,7 +56,7 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); +my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); my $Usage; sub check_opt_val($$) @@ -96,6 +96,10 @@ while (@ARGV) { $Timeout = check_opt_val($arg, $Timeout); } + elsif ($arg eq "--keepalive") + { + $Keepalive = check_opt_val($arg, $Keepalive); + } elsif ($arg eq "--tunnel") { $TunnelOpt = check_opt_val($arg, $TunnelOpt); @@ -216,7 +220,7 @@ if (!defined $Usage) $Usage = 2; } elsif ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or - defined $RunErr)) + defined $RunErr or defined $Keepalive)) { error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; @@ -245,6 +249,7 @@ if (!defined $Usage) error("you must specify the server files to delete\n"); $Usage = 2; } + $Keepalive = 60 if (!defined $Keepalive); $AgentPort = $Port if (defined $Port); if (!defined $AgentPort) { @@ -301,6 +306,9 @@ if (defined $Usage) print " connecting instead of the default one.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; print " default one for the operation.\n"; + print " --keepalive <keepalive> How often (in seconds) the run and wait operations\n"; + print " should check that the remove end is still alive and reachable.\n"; + print " The default is 60 seconds.\n"; print " --tunnel <uri> Tunnel the connection through ssh. The SSH connection is\n"; print " specified in the form of an ssh:// URI.\n"; print " --help Shows this usage message.\n"; @@ -341,14 +349,14 @@ elsif ($Cmd eq "run") print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) { - $Result = $TA->Wait($Pid, $Timeout); + $Result = $TA->Wait($Pid, $Timeout, $Keepalive); print "Child exit status: $Result\n" if (defined $Result); } } } elsif ($Cmd eq "wait") { - $Result = $TA->Wait($WaitPid, $Timeout); + $Result = $TA->Wait($WaitPid, $Timeout, $Keepalive); print "Child exit status: $Result\n" if (defined $Result); } elsif ($Cmd eq "rm")

1 0

Nikolay Sivov : testbot: Improve message for a single test failure.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: tools Branch: master Commit: 5515067284a5132e4ae4600b85c889b14e3e953b URL: http://source.winehq.org/git/tools.git/?a=commit;h=5515067284a5132e4ae4600b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 10 14:44:37 2014 +0400 testbot: Improve message for a single test failure. --- testbot/web/index.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 69cd368..cfe966b 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -124,7 +124,8 @@ sub GenerateDataCell { $HTMLStatus = $Item->Status eq "completed" ? "" : "$HTMLStatus - "; my $class = $Failures ? "testfail" : "success"; - print "$HTMLStatus<span class='$class'>$Failures test failures</span>"; + my $s = $Failures == 1 ? "" : "s"; + print "$HTMLStatus<span class='$class'>$Failures test failure$s</span>"; } } else

1 0

Piotr Caban : ole32: Update reference counter of returned moniker in CreateGenericComposite.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 770213e16c6918728f69ea33545fafabd59dbc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=770213e16c6918728f69ea335… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 10 18:27:12 2014 +0100 ole32: Update reference counter of returned moniker in CreateGenericComposite. --- dlls/ole32/compositemoniker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index e61f115..3e6788e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1938,10 +1938,12 @@ CreateGenericComposite(IMoniker *pmkFirst, IMoniker *pmkRest, IMoniker **ppmkCom if (pmkFirst==NULL && pmkRest!=NULL){ *ppmkComposite=pmkRest; + IMoniker_AddRef(pmkRest); return S_OK; } else if (pmkFirst!=NULL && pmkRest==NULL){ *ppmkComposite=pmkFirst; + IMoniker_AddRef(pmkFirst); return S_OK; } else if (pmkFirst==NULL && pmkRest==NULL)

1 0

Jacek Caban : rpcndr.h: Don't redefine EXTERN_GUID if it' s already defined.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 430b7c9b919db0da6eef8e2493daf8af4009371f URL: http://source.winehq.org/git/wine.git/?a=commit;h=430b7c9b919db0da6eef8e249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 10 13:35:28 2014 +0100 rpcndr.h: Don't redefine EXTERN_GUID if it's already defined. --- include/rpcndr.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/rpcndr.h b/include/rpcndr.h index bc895a5..99200ac 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -37,6 +37,7 @@ extern "C" { # define CONST_VTBL #endif +#ifndef EXTERN_GUID #ifdef __cplusplus #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ @@ -48,6 +49,7 @@ extern "C" { const GUID DECLSPEC_SELECTANY name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif +#endif /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */

1 0

Jacek Caban : wmvcore: Added WMCreateProfileManager implementation.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: c5b4c8e882c80b0599051066d8b9dbe45bbc3110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b4c8e882c80b0599051066d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 10 13:35:38 2014 +0100 wmvcore: Added WMCreateProfileManager implementation. --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 136 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 4893001..3799865 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -8,7 +8,7 @@ @ stub WMCreateBackupRestorer @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer -@ stub WMCreateProfileManager +@ stdcall WMCreateProfileManager(ptr) @ stdcall WMCreateReader(ptr long ptr) @ stub WMCreateReaderPriv @ stdcall WMCreateSyncReader(ptr long ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index cb52b05..5903bf8 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -20,13 +20,26 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "wmsdkidl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -76,3 +89,126 @@ HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader * return E_NOTIMPL; } + +typedef struct { + IWMProfileManager IWMProfileManager_iface; + LONG ref; +} WMProfileManager; + +static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +{ + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); +} + +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMProfileManager_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { + TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); + *ppv = &This->IWMProfileManager_iface; + }else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%x %p)\n", This, version, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%p)\n", This, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%d %p)\n", This, index, ret); + return E_NOTIMPL; +} + +static const IWMProfileManagerVtbl WMProfileManagerVtbl = { + WMProfileManager_QueryInterface, + WMProfileManager_AddRef, + WMProfileManager_Release, + WMProfileManager_CreateEmptyProfile, + WMProfileManager_LoadProfileByID, + WMProfileManager_LoadProfileByData, + WMProfileManager_SaveProfile, + WMProfileManager_GetSystemProfileCount, + WMProfileManager_LoadSystemProfile +}; + +HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) +{ + WMProfileManager *profile_mgr; + + TRACE("(%p)\n", ret); + + profile_mgr = heap_alloc(sizeof(*profile_mgr)); + if(!profile_mgr) + return E_OUTOFMEMORY; + + profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->ref = 1; + + *ret = &profile_mgr->IWMProfileManager_iface; + return S_OK; +}

1 0

Jacek Caban : wmsdkidl.idl: Added some missing declarations.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 78cf315665edd5d4cd599235147bc2ff3b284ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf315665edd5d4cd5992351… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 10 13:35:18 2014 +0100 wmsdkidl.idl: Added some missing declarations. --- include/wmsdkidl.idl | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 91dc000..984e283 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -110,6 +110,15 @@ typedef enum WMT_STREAM_SELECTION WMT_ON = 2, } WMT_STREAM_SELECTION; +typedef enum WMT_VERSION +{ + WMT_VER_4_0 = 0x00040000, + WMT_VER_7_0 = 0x00070000, + WMT_VER_8_0 = 0x00080000, + WMT_VER_9_0 = 0x00090000 +} WMT_VERSION; + +typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ object, @@ -146,6 +155,167 @@ interface IWMReaderCallback : IWMStatusCallback [ object, + uuid(96406Bdd-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMStreamList : IUnknown +{ + HRESULT GetStreams( + [out, size_is(*pcStreams)] WORD *pwStreamNumArray, + [in, out] WORD *pcStreams); + + HRESULT AddStream([in] WORD wStreamNum); + HRESULT RemoveStream([in] WORD wStreamNum); +} + +[ + object, + uuid(96406Bde-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMMutualExclusion : IWMStreamList +{ + HRESULT GetType([out] GUID *pguidType); + HRESULT SetType([in] REFGUID guidType); +} + +[ + object, + uuid(96406Bdc-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMStreamConfig : IUnknown +{ + HRESULT GetStreamType([out] GUID *pguidStreamType); + HRESULT GetStreamNumber([out] WORD *pwStreamNum); + HRESULT SetStreamNumber([in] WORD wStreamNum); + + HRESULT GetStreamName( + [out, size_is(*pcchStreamName)] WCHAR *pwszStreamName, + [in, out] WORD *pcchStreamName); + + HRESULT SetStreamName([in] LPCWSTR_WMSDK_TYPE_SAFE pwszStreamName); + + HRESULT GetConnectionName( + [out, size_is(*pcchInputName)] WCHAR *pwszInputName, + [in, out] WORD *pcchInputName); + + HRESULT SetConnectionName([in] LPCWSTR_WMSDK_TYPE_SAFE pwszInputName); + HRESULT GetBitrate([out] DWORD *pdwBitrate); + HRESULT SetBitrate([in] DWORD pdwBitrate); + HRESULT GetBufferWindow([out] DWORD *pmsBufferWindow); + HRESULT SetBufferWindow([in] DWORD msBufferWindow); +} + +[ + object, + uuid(96406bdb-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMProfile : IUnknown +{ + HRESULT GetVersion( + [out] WMT_VERSION *pdwVersion); + + HRESULT GetName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] DWORD *pcchName); + + HRESULT SetName( + [in] const WCHAR *pwszName); + + HRESULT GetDescription( + [out, size_is(*pcchDescription)] WCHAR *pwszDescription, + [in, out] DWORD *pcchDescription); + + HRESULT SetDescription( + [in] const WCHAR *pwszDescription); + + HRESULT GetStreamCount( + [out] DWORD *pcStreams); + + HRESULT GetStream( + [in] DWORD dwStreamIndex, + [out] IWMStreamConfig **ppConfig); + + HRESULT GetStreamByNumber( + [in] WORD wStreamNum, + [out] IWMStreamConfig **ppConfig); + + HRESULT RemoveStream( + [in] IWMStreamConfig *pConfig); + + HRESULT RemoveStreamByNumber( + [in] WORD wStreamNum); + + HRESULT AddStream( + [in] IWMStreamConfig *pConfig); + + HRESULT ReconfigStream( + [in] IWMStreamConfig *pConfig); + + HRESULT CreateNewStream( + [in] REFGUID guidStreamType, + [out] IWMStreamConfig **ppConfig); + + HRESULT GetMutualExclusionCount( + [out] DWORD *pcME); + + HRESULT GetMutualExclusion( + [in] DWORD dwMEIndex, + [out] IWMMutualExclusion **ppME); + + HRESULT RemoveMutualExclusion( + [in] IWMMutualExclusion *pME); + + HRESULT AddMutualExclusion( + [in] IWMMutualExclusion *pME); + + HRESULT CreateNewMutualExclusion( + [out] IWMMutualExclusion **ppME); +} + +[ + object, + uuid(d16679f2-6ca0-472d-8d31-2f5d55aee155), + pointer_default(unique), + local +] +interface IWMProfileManager : IUnknown +{ + HRESULT CreateEmptyProfile( + [in] WMT_VERSION dwVersion, + [out] IWMProfile **ppProfile); + + HRESULT LoadProfileByID( + [in] REFGUID guidProfile, + [out] IWMProfile **ppProfile); + + HRESULT LoadProfileByData( + [in] const WCHAR *pwszProfile, + [out] IWMProfile **ppProfile); + + HRESULT SaveProfile( + [in] IWMProfile *pIWMProfile, + [in] WCHAR *pwszProfile, + [in, out] DWORD *pdwLength); + + HRESULT GetSystemProfileCount( + [out] DWORD *pcProfiles); + + HRESULT LoadSystemProfile( + [in] DWORD dwProfileIndex, + [out] IWMProfile **ppProfile); +} + +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + +[ + object, uuid(96406bce-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local

1 0

Sebastian Lackner : shell32: Register user administrative tools shell folder.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: e28fe966feb999ac1d39669c2e8b0941b86cecc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28fe966feb999ac1d39669c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 7 18:31:25 2014 +0100 shell32: Register user administrative tools shell folder. Discovered by Michael Müller. --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 875be38..afa2543 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2441,7 +2441,8 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) CSIDL_COOKIES, CSIDL_HISTORY, CSIDL_MYPICTURES, - CSIDL_FONTS + CSIDL_FONTS, + CSIDL_ADMINTOOLS }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath;

1 0

Jacek Caban : vbscipt: Allow ':' to be a separator in select case statement.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: aa045d51b33fabad949a339ba0c3d73342499b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa045d51b33fabad949a339ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:52:56 2014 +0100 vbscipt: Allow ':' to be a separator in select case statement. --- dlls/vbscript/parser.y | 12 +++++++++--- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3004c3b..cd69f5d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -205,7 +205,7 @@ SimpleStatement { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } - | tSELECT tCASE Expression tNL CaseClausules tEND tSELECT + | tSELECT tCASE Expression StSep CaseClausules tEND tSELECT { $$ = new_select_statement(ctx, $3, $5); } MemberExpression @@ -273,8 +273,8 @@ Else_opt CaseClausules : /* empty */ { $$ = NULL; } - | tCASE tELSE tNL StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } - | tCASE ExpressionList tNL StatementsNl_opt CaseClausules + | tCASE tELSE StSep StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } Arguments_opt @@ -442,6 +442,12 @@ ArgumentDecl Identifier : tIdentifier { $$ = $1; } | tPROPERTY { $$ = propertyW; } + +/* Some statements accept both new line and ':' as a separator */ +StSep + : tNL + | ':' + %% static int parser_error(parser_ctx_t *ctx, const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46b34c4..374a986 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -224,6 +224,10 @@ if false then x = y : if true then call ok(false, "embedded if called") if false then x=1 else x=2 end if +x = false +if false then x = true : x = true +Call ok(x = false, "x <> false") + if false then ok false, "if false called" end if @@ -538,6 +542,22 @@ end select select case 0 end select +x = false +select case 2 + case 3,1,2,4: x = true + case 5,6,7 + Call ok(false, "unexpected case") +end select +Call ok(x, "wrong case") + +x = false +select case 2: case 5,6,7: Call ok(false, "unexpected case") + case 2,1,2,4 + x = true + case else: Call ok(false, "unexpected case else") +end select +Call ok(x, "wrong case") + if false then Sub testsub x = true

1 0

Alexandre Julliard : makedep: Pass the source directory as root for building documentation.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 727ff27907b2ecad9c9cbae471f05d07ed0563ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=727ff27907b2ecad9c9cbae47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 11:13:44 2014 +0100 makedep: Pass the source directory as root for building documentation. --- tools/makedep.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index eb77d57..b518756 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1903,32 +1903,36 @@ static struct strarray output_sources(void) if (spec_file) { - if (c2man_files.count && top_obj_dir) + if (c2man_files.count) { char *manext = get_expanded_make_variable( "api_manext" ); output( "manpages::\n" ); - output( "\t%s -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" )); + output_filename( strmake( "-o %s/man%s", top_obj_dir_path( "documentation" ), manext ? manext : "3w" )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t%s -Th -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Th -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/html", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/html" ))); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t%s -Ts -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Ts -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/api-guide" ))); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t%s -Tx -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Tx -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/api-guide-xml" ))); output_filenames( c2man_files ); output( "\n" ); strarray_add( &phony_targets, "manpages" );

1 0