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

Francois Gouget : testbot: Scheduling jobs is the Engine's responsibility.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: tools Branch: master Commit: 54621055ec0ceb7a11b227e08c2905ad3ad1b740 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54621055ec0ceb7a11b227e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:36 2018 +0200 testbot: Scheduling jobs is the Engine's responsibility. It already does not make sense to call ScheduleJobs() in other processes. So only call it from Engine.pl. 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/Patches.pm | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 3d1f2c1..b61db88 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -448,6 +448,8 @@ sub HandleWinePatchMLSubmission() my $ErrMessage = CreatePatches()->NewPatch($Entity); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -520,6 +522,8 @@ sub HandleWinePatchWebSubmission() my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -621,7 +625,6 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); - ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); @@ -630,6 +633,7 @@ sub SafetyNet() { LogMsg "Failed to check completeness of patch series: $ErrMessage\n"; } + ScheduleJobs(); } sub PrepareSocket($) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5edeab0..26127e9 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -147,8 +147,8 @@ sub GetTestList() Analyzes the current patch to determine which Wine tests are impacted. Then for each impacted test it creates a high priority WineTestBot::Job to run that test. This also creates the WineTestBot::Step objects for that Job, as well as the -WineTestBot::Task objects to run the test on each 'base' VM. Finally it calls -C<WineTestBot::Jobs::ScheduleJobs()> to run the new Jobs. +WineTestBot::Task objects to run the test on each 'base' VM. It is the +responsibility of the caller to arrange for rescheduling of the jobs. Note that the path to the file containing the actual patch is passed as a parameter. This is used to apply a combined patch for patch series. See @@ -341,9 +341,6 @@ sub Submit($$$) $Disposition .= $NewJob->Id; } $self->Disposition($Disposition); - - ScheduleJobs(); - return undef; }

1 0

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission().
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: tools Branch: master Commit: 426215c272755d6cf213fcf1b51a36b99f7859f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=426215c272755d6cf213fcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:41 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b61db88..64359ae 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -431,7 +431,7 @@ sub HandleWinePatchMLSubmission() my @Entries = readdir($dh); closedir($dh); - my @ErrMessages; + my ($NewPatch, @ErrMessages); foreach my $Entry (@Entries) { # Validate file name @@ -446,9 +446,14 @@ sub HandleWinePatchMLSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -463,6 +468,7 @@ sub HandleWinePatchMLSubmission() LogMsg "Unable to delete '$FullMessageFileName': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Francois Gouget : testbot/Engine: Only reschedule if we got a completed patch set.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: tools Branch: master Commit: 19620e33e61a30429d509c30412db4c0ddcb43d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=19620e33e61a30429d509c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:49 2018 +0200 testbot/Engine: Only reschedule if we got a completed patch set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 7 ++++--- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 ++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 1775782..730fd42 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -638,15 +638,16 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); + ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); - my $ErrMessage = $Set->CheckForCompleteSet(); - if (defined($ErrMessage)) + my ($Submitted, $ErrMessage) = $Set->CheckForCompleteSet(); + if (defined $ErrMessage) { LogMsg "Failed to check completeness of patch series: $ErrMessage\n"; } - ScheduleJobs(); + ScheduleJobs() if ($Submitted); } sub PrepareSocket($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index c0dc56f..bfd05e4 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -94,7 +94,7 @@ sub CheckComplete($) =item C<SubmitSubset()> Combines the patches leading to the specified part in the patchset, and then -calls WineTestBot::Patch::Submit() so it gets scheduled for testing. +calls WineTestBot::Patch::Submit() to create the corresponding job. =back =cut @@ -307,29 +307,27 @@ sub CheckForCompleteSet($) { my ($self) = @_; - my $ErrMessage; + my ($Submitted, @ErrMessages); foreach my $Set (@{$self->GetItems()}) { if ($Set->CheckComplete()) { my $Patch = $Set->Parts->GetItem($Set->TotalParts)->Patch; my $SetErrMessage = $Set->Submit($Patch); - if (defined($SetErrMessage)) + if (defined $SetErrMessage) { - if (! defined($ErrMessage)) - { - $ErrMessage = $SetErrMessage; - } + push @ErrMessages, $SetErrMessage; } else { $Patch->Save(); + $Submitted = 1; } $self->DeleteItem($Set); } } - return $ErrMessage; + return ($Submitted, @ErrMessages ? join("; ", @ErrMessages) : undef); } 1;

1 0

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission().
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: tools Branch: master Commit: 53f26742a6b329f402bcbe8e7782e7a8e32a3a4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=53f26742a6b329f402bcbe8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:46 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 64359ae..1775782 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -516,6 +516,7 @@ sub HandleWinePatchWebSubmission() # Add the patches in increasing WebPatchId order so that next time # $LatestWebPatchId still makes sense in case something goes wrong now + my $NewPatch; foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { # Create a working dir @@ -526,9 +527,14 @@ sub HandleWinePatchWebSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -537,6 +543,7 @@ sub HandleWinePatchWebSubmission() LogMsg "Unable to delete '$WorkDir': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Kyle Auble : Keep all event and wineconf photos on wiki
by Jeremy Newman May 7, 2018

May 7, 2018

Module: website Branch: master Commit: 6a4b94365dc077caa63ad3d4b1f2e9a7c8124495 URL: https://source.winehq.org/git/website.git/?a=commit;h=6a4b94365dc077caa63ad… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:47:04 2018 -0400 Keep all event and wineconf photos on wiki Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/misc/WineAward_2008.png | Bin 336388 -> 0 bytes images/misc/WineAward_2008_sm.png | Bin 19124 -> 0 bytes images/wineconf/wineconf_logo.jpg | Bin 6076 -> 0 bytes images/wineconf05_fei.jpg | Bin 149591 -> 0 bytes images/wineconf05_fei_thmb.jpg | Bin 21892 -> 0 bytes images/wineconf05_grp.jpg | Bin 1258517 -> 0 bytes images/wineconf05_grp_thmb.jpg | Bin 24928 -> 0 bytes images/wineconf06_grp.jpg | Bin 1030627 -> 0 bytes images/wineconf06_grp_thmb.jpg | Bin 18105 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/misc/WineAward_2008.png b/images/misc/WineAward_2008.png deleted file mode 100644 index 69921a5..0000000 Binary files a/images/misc/WineAward_2008.png and /dev/null differ diff --git a/images/misc/WineAward_2008_sm.png b/images/misc/WineAward_2008_sm.png deleted file mode 100644 index 2748c76..0000000 Binary files a/images/misc/WineAward_2008_sm.png and /dev/null differ diff --git a/images/wineconf/wineconf_logo.jpg b/images/wineconf/wineconf_logo.jpg deleted file mode 100644 index 8b0e51d..0000000 Binary files a/images/wineconf/wineconf_logo.jpg and /dev/null differ diff --git a/images/wineconf05_fei.jpg b/images/wineconf05_fei.jpg deleted file mode 100644 index 32dfe2a..0000000 Binary files a/images/wineconf05_fei.jpg and /dev/null differ diff --git a/images/wineconf05_fei_thmb.jpg b/images/wineconf05_fei_thmb.jpg deleted file mode 100644 index 86d9eb6..0000000 Binary files a/images/wineconf05_fei_thmb.jpg and /dev/null differ diff --git a/images/wineconf05_grp.jpg b/images/wineconf05_grp.jpg deleted file mode 100644 index 7207ce2..0000000 Binary files a/images/wineconf05_grp.jpg and /dev/null differ diff --git a/images/wineconf05_grp_thmb.jpg b/images/wineconf05_grp_thmb.jpg deleted file mode 100644 index f7b4bdd..0000000 Binary files a/images/wineconf05_grp_thmb.jpg and /dev/null differ diff --git a/images/wineconf06_grp.jpg b/images/wineconf06_grp.jpg deleted file mode 100644 index 8637c5a..0000000 Binary files a/images/wineconf06_grp.jpg and /dev/null differ diff --git a/images/wineconf06_grp_thmb.jpg b/images/wineconf06_grp_thmb.jpg deleted file mode 100644 index e04014b..0000000 Binary files a/images/wineconf06_grp_thmb.jpg and /dev/null differ

1 0

Kyle Auble : Delete old distro icons & screenshots
by Jeremy Newman May 7, 2018

May 7, 2018

Module: website Branch: master Commit: 458b852f3539940178352fc15b0239dfc5329410 URL: https://source.winehq.org/git/website.git/?a=commit;h=458b852f3539940178352… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:41:43 2018 -0400 Delete old distro icons & screenshots It seems the only files here still in use are already on the wiki. We should probably move over to SVGs for the icons anyways. Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/distro/crossover.png | Bin 2501 -> 0 bytes images/distro/crossover_swoosh.png | Bin 23210 -> 0 bytes images/distro/de_ubuntu-ppa.png | Bin 80414 -> 0 bytes images/distro/debian.png | Bin 1253 -> 0 bytes images/distro/fr_ubuntu-ppa.png | Bin 44730 -> 0 bytes images/distro/freebsd.png | Bin 2091 -> 0 bytes images/distro/redhat.png | Bin 2634 -> 0 bytes images/distro/slackware.png | Bin 2771 -> 0 bytes images/distro/sun.png | Bin 1547 -> 0 bytes images/distro/suse.png | Bin 882 -> 0 bytes images/distro/transgaming.png | Bin 2015 -> 0 bytes images/distro/ubuntu-ppa.png | Bin 58532 -> 0 bytes images/distro/ubuntu-softwaresources1.png | Bin 48850 -> 0 bytes images/distro/ubuntu-softwaresources2.png | Bin 36288 -> 0 bytes images/distro/ubuntu.png | Bin 2037 -> 0 bytes images/distro/windows.png | Bin 1590 -> 0 bytes images/distro/winetools.png | Bin 2226 -> 0 bytes 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/crossover.png b/images/distro/crossover.png deleted file mode 100644 index f2b1543..0000000 Binary files a/images/distro/crossover.png and /dev/null differ diff --git a/images/distro/crossover_swoosh.png b/images/distro/crossover_swoosh.png deleted file mode 100644 index 5d03e09..0000000 Binary files a/images/distro/crossover_swoosh.png and /dev/null differ diff --git a/images/distro/de_ubuntu-ppa.png b/images/distro/de_ubuntu-ppa.png deleted file mode 100644 index 7a55111..0000000 Binary files a/images/distro/de_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/debian.png b/images/distro/debian.png deleted file mode 100644 index 65fba63..0000000 Binary files a/images/distro/debian.png and /dev/null differ diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png deleted file mode 100644 index 8aed5e5..0000000 Binary files a/images/distro/fr_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/freebsd.png b/images/distro/freebsd.png deleted file mode 100644 index 3614407..0000000 Binary files a/images/distro/freebsd.png and /dev/null differ diff --git a/images/distro/redhat.png b/images/distro/redhat.png deleted file mode 100644 index d026186..0000000 Binary files a/images/distro/redhat.png and /dev/null differ diff --git a/images/distro/slackware.png b/images/distro/slackware.png deleted file mode 100644 index 4dfd9f9..0000000 Binary files a/images/distro/slackware.png and /dev/null differ diff --git a/images/distro/sun.png b/images/distro/sun.png deleted file mode 100644 index 88c1107..0000000 Binary files a/images/distro/sun.png and /dev/null differ diff --git a/images/distro/suse.png b/images/distro/suse.png deleted file mode 100644 index 6d7c630..0000000 Binary files a/images/distro/suse.png and /dev/null differ diff --git a/images/distro/transgaming.png b/images/distro/transgaming.png deleted file mode 100644 index 6261284..0000000 Binary files a/images/distro/transgaming.png and /dev/null differ diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png deleted file mode 100644 index d839cfc..0000000 Binary files a/images/distro/ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources1.png b/images/distro/ubuntu-softwaresources1.png deleted file mode 100644 index f64f15f..0000000 Binary files a/images/distro/ubuntu-softwaresources1.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources2.png b/images/distro/ubuntu-softwaresources2.png deleted file mode 100644 index a4bdb12..0000000 Binary files a/images/distro/ubuntu-softwaresources2.png and /dev/null differ diff --git a/images/distro/ubuntu.png b/images/distro/ubuntu.png deleted file mode 100644 index 08c88e9..0000000 Binary files a/images/distro/ubuntu.png and /dev/null differ diff --git a/images/distro/windows.png b/images/distro/windows.png deleted file mode 100644 index c623437..0000000 Binary files a/images/distro/windows.png and /dev/null differ diff --git a/images/distro/winetools.png b/images/distro/winetools.png deleted file mode 100644 index f3e104e..0000000 Binary files a/images/distro/winetools.png and /dev/null differ

1 0

Michael Müller : combase: Add stub for CleanupTlsOleState.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: 7bb7bc86d63cbc2ade8e627515422ae19ece6d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb7bc86d63cbc2ade8e6275… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:18 2018 +0000 combase: Add stub for CleanupTlsOleState. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 72a7eb5..c8a8dee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -66,7 +66,7 @@ @ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID @ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString @ stub CleanupOleStateInAllTls -@ stub CleanupTlsOleState +@ stdcall CleanupTlsOleState(ptr) @ stub ClearCleanupFlag @ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess @ stub CoAllowUnmarshalerCLSID diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ee03bd3..63e218d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -274,3 +274,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } + +/*********************************************************************** + * CleanupTlsOleState (combase.@) + */ +void WINAPI CleanupTlsOleState(void *unknown) +{ + FIXME("(%p): stub\n", unknown); +}

1 0

Michael Müller : combase: Add stub for RoGetServerActivatableClasses.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: 699003a459dce053fae0f2b62844c1b93e41728a URL: https://source.winehq.org/git/wine.git/?a=commit;h=699003a459dce053fae0f2b6… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:15 2018 +0000 combase: Add stub for RoGetServerActivatableClasses. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec index 350ac04..20c8d9c 100644 --- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec @@ -1,2 +1,2 @@ @ stub RoGetActivatableClassRegistration -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ec4a6cd..c721f43 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -254,7 +254,7 @@ @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ffcb0e9..96165e4 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -251,3 +251,15 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, *cookie = (void *)0xcafecafe; return S_OK; } + +/*********************************************************************** + * RoGetServerActivatableClasses (combase.@) + */ +HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count) +{ + FIXME("(%p, %p, %p): stub\n", name, classes, count); + + if (count) + *count = 0; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoGetApartmentIdentifier.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: a422f0ef55f0dc2e4f23a68d6966586e06d7303d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a422f0ef55f0dc2e4f23a68d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:12 2018 +0000 combase: Add stub for RoGetApartmentIdentifier. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 978c3dc..88139fb 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f42bdae..ff89232 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -250,7 +250,7 @@ @ stub RoGetActivatableClassRegistration @ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index bfd07fb..9cceb82 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -218,3 +218,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) return hr; } + +/*********************************************************************** + * RoGetApartmentIdentifier (combase.@) + */ +HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) +{ + FIXME("(%p): stub\n", identifier); + + if (!identifier) + return E_INVALIDARG; + + *identifier = 0xdeadbeef; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoRegisterActivationFactories.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: e5608bd2aed190699181128991246802526c3ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5608bd2aed1906991811289… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:16 2018 +0000 combase: Add stub for RoRegisterActivationFactories. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index d27130c..32b9474 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) combase.RoRegisterActivationFactories @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c721f43..72a7eb5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -262,7 +262,7 @@ @ stub RoOriginateErrorW @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 96165e4..ee03bd3 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -263,3 +263,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW *count = 0; return S_OK; } + +/*********************************************************************** + * RoRegisterActivationFactories (combase.@) + */ +HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks, + UINT32 count, RO_REGISTRATION_COOKIE *cookie) +{ + FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie); + + return S_OK; +}

1 0