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

Francois Gouget : testbot/Engine: Fix a minor typo in a comment.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 30e3a6d665925d7794f14d39c16d2506412e9ff0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=30e3a6d665925d7794f14d39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:27 2014 +0200 testbot/Engine: Fix a minor typo in a comment. --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6e2ff1c..ccaadc1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -590,7 +590,7 @@ through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and +changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. =back

1 0

Francois Gouget : testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: e9f20ff64423cad602bf04f9c9e42af4f0512e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9f20ff64423cad602bf04f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:58 2014 +0200 testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler. $(CC) is standard and does not require the autoconf machinery. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 5a7b735..4f16f9c 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,11 +9,11 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - gcc -o $@ $^ + $(CC) -o $@ $^ strip $@ .c.o: - gcc -Wall -g -c -o $@ $< + $(CC) -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj

1 0

Francois Gouget : testbot/TestAgent: Make sure we don't overflow alarm()' s 32-bit limit.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 4f9cf46a80f18139f326d611f3575075d4d22d85 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4f9cf46a80f18139f326d611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:45 2014 +0200 testbot/TestAgent: Make sure we don't overflow alarm()'s 32-bit limit. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 3c84d49..1acb0cd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -174,7 +174,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - alarm($Timeout); + # alarm() has a 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); } }

1 0

Francois Gouget : testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: eeed0b5f0f4af7d985e9e72135f6f75ffe1c1d82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeed0b5f0f4af7d985e9e721… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:04 2014 +0200 testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory. Otherwise there is a race condition between CheckWinetestUpdate and the Engine. --- testbot/bin/CheckForWinetestUpdate.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 98165a3..fc24fb6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -110,8 +110,6 @@ sub AddJob LogMsg "Failed to save job: $ErrMessage\n"; exit 1; } - - $NewStep->HandleStaging($NewJob->Id); } }

1 0

Francois Gouget : testbot: Better document the use of the staging directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 7d4c644fccff381619dbc49a48ae644daf7b81b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d4c644fccff381619dbc49a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:45 2014 +0200 testbot: Better document the use of the staging directory. Also remove an unused variable in CheckForWinetestUpdate. --- testbot/bin/CheckForWinetestUpdate.pl | 13 +++++++++---- testbot/web/Submit.pl | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5d30913..98165a3 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -175,7 +175,11 @@ umask 002; mkdir "$DataDir/latest"; mkdir "$DataDir/staging"; -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# check that it is truly new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. my $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") { @@ -186,7 +190,7 @@ my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuff my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $NowDate = gmtime; +my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -230,14 +234,15 @@ if ($Bits == 32) { AddReconfigJob(); AddJob(1, $FileNameRandomPart, $Bits); - + + # Create another copy for the non-base VMs Job. $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") { $FileNameRandomPart = GenerateRandomString(32); } $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (! copy($LatestFileName, $StagingFileName)) + if (!copy($LatestFileName, $StagingFileName)) { LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3bcfad9..d381150 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,8 +792,10 @@ sub OnSubmit return !1; } - # Make sure the file has a unique name even when not picked up directly - # by the engine + # Store the file in the staging directory until the relevant Job and Step + # IDs are known and it can be moved to the jobs directory tree. But rename + # it so it does not get overwritten if the user submits another one before + # the Engine gets around to doing so. my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName")))

1 0

Francois Gouget : testbot/Engine: Remove the JobSubmit() notification. It' s redundant with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: f70cf6ceb4a29d8d041d2e07ca0af04789b8e741 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f70cf6ceb4a29d8d041d2e07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:11 2014 +0200 testbot/Engine: Remove the JobSubmit() notification. It's redundant with RescheduleJobs(). It does not need to call Step::HandleStaging() since the Job scheduler does that already. So then it's identical to the RescheduleJobs() notification. --- testbot/bin/Engine.pl | 34 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- testbot/web/Submit.pl | 8 ++++--- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f8b7e1e..6e2ff1c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -257,39 +257,6 @@ sub HandlePing return "1pong\n"; } -sub HandleJobSubmit -{ - my $JobKey = $_[0]; - - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) - { - LogMsg "JobSubmit for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; - } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage; - foreach my $Step (@{$Job->Steps->GetItems()}) - { - $ErrMessage = $Step->HandleStaging($JobKey); - if (defined($ErrMessage)) - { - LogMsg "Staging problem: $ErrMessage\n"; - } - } - - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleJobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -579,7 +546,6 @@ my %Handlers=( "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, - "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, "reschedulejobs" => \&HandleRescheduleJobs, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index a241c81..d0d4890 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel +(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -99,23 +99,6 @@ sub PingEngine return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobSubmit -{ - my $JobKey = $_[0]; - - my $Reply = SendCmdReceiveReply("jobsubmit $JobKey\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub JobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0d9d0b4..3bcfad9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -917,14 +917,16 @@ sub OnSubmit $Jobs = undef; # Notify engine - if (defined(JobSubmit($JobKey))) + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) { + LogMsg "$ErrMessage\n"; $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); + $self->{JobKey} = $JobKey; return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $NewJob->Id); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); exit; }

1 0

Shuai Meng : vbscript: Implemented CByte.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: db42703d5ff9eb31130896c9d7d7713b8fe09d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db42703d5ff9eb31130896c9d… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed May 14 23:05:02 2014 +0800 vbscript: Implemented CByte. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9aeba34..484158f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -424,8 +424,25 @@ static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_UI1); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12124b7..8197d6d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -533,4 +533,48 @@ MyObject.myval = 0 Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +Sub testCByteError(strings, error_num1,error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CByte(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CByte(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CByte(Empty) = 0, "CByte(Empty) = " & CByte(Empty)) +Call ok(getVT(CByte(Empty)) = "VT_UI1", "getVT(CByte(Empty)) = " & getVT(CByte(Empty))) +Call ok(CByte(255) = 255, "CByte(255) = " & CByte(255)) +Call ok(getVT(CByte(255)) = "VT_UI1", "getVT(CByte(255)) = " & getVT(CByte(255))) +Call ok(CByte(255.49) = 255, "CByte(255.49) = " & CByte(255.49)) +Call ok(getVT(CByte(255.49)) = "VT_UI1", "getVT(CByte(255.49)) = " & getVT(CByte(255.49))) +Call testCByteError(1, 0, 458) +Call testCByteError("", 13, 13) +Call testCByteError("-1", 6, 6) +Call testCByteError("258", 6, 6) +Call testCByteError("TRUE", 13, 13) +Call testCByteError("FALSE", 13, 13) +Call testCByteError("#TRue#", 13, 13) +Call testCByteError("#fAlSE#", 13, 13) +If isEnglishLang Then + Call ok(CByte("-0.5") = 0, "CByte(""-0.5"") = " & CByte("-0.5")) + Call ok(getVT(CByte("-0.5")) = "VT_UI1", "getVT(CByte(""-0.5"")) = " & getVT(CByte("-0.5"))) +End If +Call ok(CByte(True) = 255, "CByte(True) = " & CByte(True)) +Call ok(getVT(CByte(True)) = "VT_UI1", "getVT(CByte(True)) = " & getVT(CByte(True))) +Call ok(CByte(False) = 0, "CByte(False) = " & CByte(False)) +Call ok(getVT(CByte(False)) = "VT_UI1", "getVT(CByte(False)) = " & getVT(CByte(False))) +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 1 +Call ok(CByte(MyObject) = 1, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 0 +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 53ead45..9620398 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -181,6 +181,8 @@ static const char *vt2a(VARIANT *v) return "VT_ARRAY|VT_VARIANT"; case VT_ARRAY|VT_BYREF|VT_VARIANT: return "VT_ARRAY|VT_BYREF|VT_VARIANT"; + case VT_UI1: + return "VT_UI1"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL;

1 0

Jacek Caban : wmvcore: Added IWMReader interface stub implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c0247ab291f11c92bba43e51633bb8adee52e290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0247ab291f11c92bba43e516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 18:43:09 2014 +0200 wmvcore: Added IWMReader interface stub implementation. --- dlls/wmvcore/wmvcore_main.c | 161 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5903bf8..3382542 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -72,12 +72,167 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +typedef struct { + IWMReader IWMReader_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { - FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; - *reader = NULL; + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->ref = 1; + *ret_reader = &reader->IWMReader_iface; return E_NOTIMPL; }

1 0

Jacek Caban : oleaut32: Added debugstr_variant helper for better debug traces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: ed41fc1d9b0aabd581dd7f1e0eb9e1939b96b26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed41fc1d9b0aabd581dd7f1e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 16:55:57 2014 +0200 oleaut32: Added debugstr_variant helper for better debug traces. --- dlls/oleaut32/varformat.c | 36 +++++++++++++++--------------------- dlls/oleaut32/variant.c | 33 +++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 2 ++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e72a170..0e1c370 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1201,9 +1201,8 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; V_VT(&vBool) = VT_BOOL; @@ -1612,9 +1611,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1954,9 +1952,8 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2168,9 +2165,8 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%p->(%s%s),%s,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, - dwFlags, pbstrOut); + TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -2219,8 +2215,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; - TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2272,8 +2267,8 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2383,9 +2378,8 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, - dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2457,8 +2451,8 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c3bd225..7221787 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -78,6 +78,39 @@ const char * const wine_vflags[16] = "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", }; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_I1: + return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); + case VT_I2: + return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); + case VT_ERROR: + return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); + case VT_BOOL: + return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); + default: + return wine_dbg_sprintf("%p {vt %s%s}", v, debugstr_VT(v), debugstr_VF(v)); + } +} + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index d521b20..e13e56a 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -57,6 +57,8 @@ extern const char * const wine_vflags[] DECLSPEC_HIDDEN; #define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) #define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + /* Size constraints */ #define I1_MAX 0x7f #define I1_MIN ((-I1_MAX)-1)

1 0

Piotr Caban : oleacc: Add GetStateText implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 5f51dda7eeab4d905ecf86ac447b76346ab0df0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51dda7eeab4d905ecf86ac4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:51 2014 +0200 oleacc: Add GetStateText implementation. --- dlls/oleacc/main.c | 64 +++++++++- dlls/oleacc/oleacc.rc | 34 ++++++ dlls/oleacc/oleacc.spec | 4 +- dlls/oleacc/resource.h | 50 ++++++++ dlls/oleacc/tests/main.c | 71 +++++++++++ po/ar.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/bg.po | 274 ++++++++++++++++++++++++++++++++---------- po/ca.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/cs.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/de.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/el.po | 269 ++++++++++++++++++++++++++++++++---------- po/en.po | 258 ++++++++++++++++++++++++++++++---------- po/en_US.po | 258 ++++++++++++++++++++++++++++++---------- po/eo.po | 282 ++++++++++++++++++++++++++++++++++---------- po/es.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fa.po | 263 +++++++++++++++++++++++++++++++---------- po/fi.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fr.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/he.po | 285 ++++++++++++++++++++++++++++++++++---------- po/hi.po | 258 ++++++++++++++++++++++++++++++---------- po/hr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/hu.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/it.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ja.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ko.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/lt.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ml.po | 258 ++++++++++++++++++++++++++++++---------- po/nb_NO.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/nl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/or.po | 258 ++++++++++++++++++++++++++++++---------- po/pa.po | 258 ++++++++++++++++++++++++++++++---------- po/pl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 292 +++++++++++++++++++++++++++++++++++---------- po/rm.po | 261 ++++++++++++++++++++++++++++++---------- po/ro.po | 292 +++++++++++++++++++++++++++++++++++---------- po/ru.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 280 +++++++++++++++++++++++++++++++++---------- po/sl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 288 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/te.po | 258 ++++++++++++++++++++++++++++++---------- po/th.po | 270 ++++++++++++++++++++++++++++++++---------- po/tr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/uk.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 263 +++++++++++++++++++++++++++++++---------- po/wine.pot | 258 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 286 ++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 294 ++++++++++++++++++++++++++++++++++++---------- 51 files changed, 10235 insertions(+), 2993 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f51dda7eeab4d905ecf8…

1 0