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

[PATCH] shell32: Convert / to \ when parsing file list.
by Daniel Lehman May 9, 2018

May 9, 2018

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/shell32/shlfileop.c | 9 +++++++++ dlls/shell32/tests/shlfileop.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 5d93334..bcc9277 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1005,6 +1005,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) { LPCWSTR ptr = szFiles; WCHAR szCurFile[MAX_PATH]; + LPWSTR szPos; DWORD i = 0; if (!szFiles) @@ -1039,6 +1040,14 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) flList->feFiles[i].bFromRelative = FALSE; } + szPos = szCurFile; + while (*szPos) + { + if (*szPos == '/') + *szPos = '\\'; + szPos++; + } + /* parse wildcard files if they are in the filename */ if (StrPBrkW(szCurFile, wWildcardChars)) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 6a220fa..8fb4dcf 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1869,6 +1869,28 @@ static void test_copy(void) ok(retval != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* test with / */ + CreateDirectoryA("dir", NULL); + CreateDirectoryA("dir\\subdir", NULL); + createTestFile("dir\\subdir\\aa.txt"); + shfo.pFrom = "dir/subdir/aa.txt\0"; + shfo.pTo = "dir\\destdir/aa.txt\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperationA(&shfo); + if (dir_exists("dir\\destdir")) + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("dir\\destdir\\aa.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir\\destdir"), "Expected dir to exist\n"); + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* WinXp, Win2k */); + } + ok(DeleteFileA("dir\\subdir\\aa.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir\\subdir"), "Expected dir to exist\n"); + ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } /* tests the FO_MOVE action */ @@ -1921,6 +1943,30 @@ static void test_move(void) clean_after_shfo_tests(); init_shfo_tests(); + /* same tests above, but with / */ + set_curr_dir_path(from, "testdir2/*.*\0"); + set_curr_dir_path(to, "test4.txt\0"); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS || + broken(retval == ERROR_FILE_NOT_FOUND), /* WinXp, Win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + { + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + + ok(dir_exists("testdir2"), "dir should not be moved\n"); + ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); + ok(!dir_exists("testdir2\\nested"), "dir should be moved\n"); + ok(!file_exists("testdir2\\nested\\two.txt"), "file should be moved\n"); + + ok(file_exists("test4.txt\\one.txt"), "file should exist\n"); + ok(dir_exists("test4.txt\\nested"), "dir should exist\n"); + ok(file_exists("test4.txt\\nested\\two.txt"), "file should exist\n"); + } + + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; shfo.pFrom = from; -- 2.7.4

1 0

[PATCH] testbot: Detect and kill stuck task scripts.
by Francois Gouget May 9, 2018

May 9, 2018

The tasks themselves have a timeout which the corresponding scripts enforce. However the scripts themselves may get stuck, typically due to network problems. When that happens they can end up blocking the whole TestBot. So make sure the TestBot engine itself can detect stuck scripts and take corrective action. Note that the detection is not very timely but will happen at the latest in the SafetyNet() function. This means there will be at most a 10 minutes delay. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 7 +++++- testbot/bin/WineRunBuild.pl | 1 + testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 1 + testbot/ddl/update32.sql | 5 +++++ testbot/ddl/winetestbot.sql | 25 +++++++++++---------- testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 17 ++++++++------ testbot/lib/WineTestBot/Engine/Scheduler.pm | 16 ++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 7 ++++-- testbot/lib/WineTestBot/VMs.pm | 11 ++++++--- testbot/web/admin/VMDetails.pl | 3 ++- 12 files changed, 90 insertions(+), 27 deletions(-) create mode 100644 testbot/ddl/update32.sql diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fa07d2d20..5d60dde1b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -196,6 +196,7 @@ sub FatalError($) # Put the VM offline if nobody else modified its status before us $VM = CreateVMs()->GetItem($VMKey); $VM->Status("offline") if ($VM->Status eq $CurrentStatus); + $VM->ChildDeadline(undef); $VM->ChildPid(undef); my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) @@ -241,7 +242,11 @@ sub ChangeStatus($$;$) } $VM->Status($To); - $VM->ChildPid(undef) if ($Done); + if ($Done) + { + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + } my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined $ErrMessage) { diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 3a52dbd04..27b8be0e0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -250,6 +250,7 @@ sub WrapUpAndExit($;$$) if ($VM->Status eq 'running') { $VM->Status($NewVMStatus); + $VM->ChildDeadline(undef); $VM->ChildPid(undef); $VM->Save(); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 77994a3a3..713712cec 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -251,6 +251,7 @@ sub WrapUpAndExit($;$$) if ($VM->Status eq 'running') { $VM->Status($NewVMStatus); + $VM->ChildDeadline(undef); $VM->ChildPid(undef); $VM->Save(); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 4f69a1e4e..231f34e0c 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -279,6 +279,7 @@ sub WrapUpAndExit($;$$$) if ($VM->Status eq 'running') { $VM->Status($NewVMStatus); + $VM->ChildDeadline(undef); $VM->ChildPid(undef); $VM->Save(); } diff --git a/testbot/ddl/update32.sql b/testbot/ddl/update32.sql new file mode 100644 index 000000000..5864d63e0 --- /dev/null +++ b/testbot/ddl/update32.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD ChildDeadline DATETIME NULL + AFTER ChildPid; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 41740159b..89810ddc0 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -44,18 +44,19 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE VMs ( - Name VARCHAR(20) NOT NULL, - SortOrder INT(3) NOT NULL, - Type ENUM('win32', 'win64', 'build') NOT NULL, - Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, - ChildPid INT(5) NULL, - VirtURI VARCHAR(64) NOT NULL, - VirtDomain VARCHAR(32) NOT NULL, - IdleSnapshot VARCHAR(32) NOT NULL, - Hostname VARCHAR(64) NOT NULL, - Description VARCHAR(40) NULL, - Details VARCHAR(512) NULL, + Name VARCHAR(20) NOT NULL, + SortOrder INT(3) NOT NULL, + Type ENUM('win32', 'win64', 'build') NOT NULL, + Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, + ChildPid INT(5) NULL, + ChildDeadline DATETIME NULL, + VirtURI VARCHAR(64) NOT NULL, + VirtDomain VARCHAR(32) NOT NULL, + IdleSnapshot VARCHAR(32) NOT NULL, + Hostname VARCHAR(64) NOT NULL, + Description VARCHAR(40) NULL, + Details VARCHAR(512) NULL, PRIMARY KEY (Name) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 7d18b7271..61a722a21 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2475,6 +2475,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#ChildDeadline#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#DATETIME#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#VirtURI#</dia:string> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 9052fc4d0..2eb4f45a8 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -28,12 +28,11 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs - $MaxVMsWhenIdle - $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail - $RobotEMail + $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout - $BuildTimeout $ReconfigTimeout $TagPrefix $MaxUnitSize - $ProjectName $PatchesMailingList $LDAPServer + $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix + $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays @@ -44,9 +43,9 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $MaxTaskTries $AdminEMail + $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $SingleTimeout $BuildTimeout $ReconfigTimeout + $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel @@ -80,6 +79,8 @@ $WaitForToolsInVM = 30; # How long to let the VM settle down after the revert before starting a task on # it (in seconds). $SleepAfterRevert = 0; +# Take into account $WaitForToolsInVM and $SleepAfterRevert +$VMToolTimeout = 6 * 60; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; @@ -96,6 +97,8 @@ $BuildTimeout = 5 * 60; # How long to let a full recompilation run before forcibly shutting it down # (in seconds). $ReconfigTimeout = 45 * 60; +# How much to add to the task timeout to account for file transfers, etc. +$TimeoutMargin = 2 * 60; # Maximum amount of traces for a test unit. $MaxUnitSize = 32 * 1024; diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 4eef3c95d..52a6cedef 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -244,6 +244,7 @@ sub _CheckAndClassifyVMs() # created by the scripts called from the scheduler. $Sched->{recordgroups}->Save(); + my $Now = time(); my $FoundVMErrors; # Count the VMs that are 'active', that is, that use resources on the host, # and those that are reverting. Also build a prioritized list of those that @@ -261,7 +262,19 @@ sub _CheckAndClassifyVMs() my $Host = _GetSchedHost($Sched, $VM); if ($VM->HasRunningChild()) { - if ($VM->Status =~ /^(?:dirty|running|reverting)$/) + if (defined $VM->ChildDeadline and $VM->ChildDeadline < $Now) + { + # The child process got stuck! + $FoundVMErrors = 1; + $VM->KillChild(); + $VM->Status("dirty"); + $VM->Save(); + $VM->RecordResult($Sched->{records}, "boterror stuck process"); + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; + } + elsif ($VM->Status =~ /^(?:dirty|running|reverting)$/) { $Sched->{busyvms}->{$VMKey} = 1; $Host->{$VM->Status}++; @@ -321,6 +334,7 @@ sub _CheckAndClassifyVMs() # The VM is missing its child process or it died unexpectedly. Mark # the VM dirty so a revert or shutdown brings it back to a known state. $FoundVMErrors = 1; + $VM->ChildDeadline(undef); $VM->ChildPid(undef); $VM->Status("dirty"); $VM->Save(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5121abb19..72dd3ff23 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -127,7 +127,9 @@ sub Run($$) my $Args = ["$BinDir/${ProjectName}Run$Script.pl", "--log-only", $JobId, $StepNo, $TaskNo]; - my $ErrMessage = $self->VM->Run("running", $Args, \&_SetupTask, $self); + my $ErrMessage = $self->VM->Run("running", $Args, + $self->Timeout + $TimeoutMargin, + \&_SetupTask, $self); if (!$ErrMessage) { $self->Status("running"); @@ -159,7 +161,7 @@ sub UpdateStatus($$) my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>$TaskDir/err") { - print TASKLOG "TestBot process died unexpectedly\n"; + print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG; } umask($OldUMask); @@ -173,6 +175,7 @@ sub UpdateStatus($$) if ($VM->Status eq "running") { $VM->Status('dirty'); + $VM->ChildDeadline(undef); $VM->ChildPid(undef); $VM->Save(); $VM->RecordResult(undef, "boterror process died"); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 839986be9..9f5a2c78d 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -298,6 +298,7 @@ sub KillChild($) WineTestBot::Log::LogMsg("Killing child ". $self->ChildPid ."\n"); kill("TERM", $self->ChildPid); } + $self->ChildDeadline(undef); $self->ChildPid(undef); } @@ -329,9 +330,9 @@ sub OnSaved($) } } -sub Run($$$$$) +sub Run($$$$$$) { - my ($self, $NewStatus, $Args, $ChildSetup, $SetupData) = @_; + my ($self, $NewStatus, $Args, $ChildTimeout, $ChildSetup, $SetupData) = @_; my $Tool = basename($Args->[0]); @@ -368,6 +369,7 @@ sub Run($$$$$) # Set the Status and ChildPid $self->Status($NewStatus); $self->ChildPid($Pid); + $self->ChildDeadline(time() + $ChildTimeout); my ($ErrProperty, $ErrMessage) = $self->Save(); if ($ErrMessage) { @@ -410,6 +412,7 @@ sub Run($$$$$) # Reset the Status and ChildPid since the exec failed $self->Status("offline"); + $self->ChildDeadline(undef); $self->ChildPid(undef); my ($ErrProperty, $ErrMessage) = $self->Save(); if ($ErrMessage) @@ -433,7 +436,8 @@ sub _RunVMTool($$$) my $Tool = "LibvirtTool.pl"; unshift @$Args, "$BinDir/$Tool"; - return $self->Run($NewStatus, $Args, \&_SetupChild, undef); + my $Timeout = $NewStatus eq "offline" ? 3600 : $VMToolTimeout; + return $self->Run($NewStatus, $Args, $Timeout, \&_SetupChild, undef); } =pod @@ -664,6 +668,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f883884c7..93e92763a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -39,7 +39,8 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - return "" if ($PropertyDescriptor->GetName() eq "ChildPid"); + my $PropertyName = $PropertyDescriptor->GetName(); + return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline)$/); return $self->SUPER::DisplayProperty($PropertyDescriptor); } -- 2.17.0

1 0

[PATCH 1/4] msdmo: Return a valid enumerator even if the category doesn't exist.
by Zebediah Figura May 8, 2018

May 8, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/dmoreg.c | 8 +++----- dlls/msdmo/tests/Makefile.in | 2 +- dlls/msdmo/tests/msdmo.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ead8864..43b0438 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -390,7 +390,6 @@ static HRESULT IEnumDMO_Constructor( { IEnumDMOImpl* lpedmo; HRESULT hr; - LONG ret; *obj = NULL; @@ -405,6 +404,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->dwFlags = dwFlags; lpedmo->cInTypes = cInTypes; lpedmo->cOutTypes = cOutTypes; + lpedmo->hkey = NULL; hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); if (FAILED(hr)) @@ -417,8 +417,7 @@ static HRESULT IEnumDMO_Constructor( /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) { - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey); } else { @@ -426,8 +425,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szKey[MAX_PATH]; wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey); } lerr: diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 105baba..22a8e35 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msdmo.dll -IMPORTS = msdmo +IMPORTS = advapi32 dmoguids msdmo uuid C_SRCS = \ msdmo.c diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 00ab656..32d79ce 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" +#include <stdio.h> +#define COBJMACROS #include "dmo.h" #include "wine/test.h" @@ -27,8 +28,19 @@ static const GUID GUID_unknowndmo = {0x14d99047,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x static const GUID GUID_unknowncategory = {0x14d99048,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; static const GUID GUID_wmp1 = {0x13a7995e,0x7d8f,0x45b4,{0x9c,0x77,0x81,0x92,0x65,0x22,0x57,0x63}}; +static const char *guid_to_string(const GUID *guid) +{ + static char buffer[50]; + sprintf(buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buffer; +} + static void test_DMOUnregister(void) { + static char buffer[200]; static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; @@ -53,6 +65,10 @@ static void test_DMOUnregister(void) hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* clean up category since Windows doesn't */ + sprintf(buffer, "DirectShow\\MediaObjects\\Categories\\%s", guid_to_string(&GUID_unknowncategory)); + RegDeleteKeyA(HKEY_CLASSES_ROOT, buffer); } static void test_DMOGetName(void) @@ -70,8 +86,26 @@ static void test_DMOGetName(void) ok(name[0] == 'a', "got %x\n", name[0]); } +static void test_DMOEnum(void) +{ + IEnumDMO *enum_dmo; + HRESULT hr; + CLSID clsid; + WCHAR *name; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + todo_wine + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + + IEnumDMO_Release(enum_dmo); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); + test_DMOEnum(); } -- 2.7.4

1 3

[PATCH 8/8] urlmon: Added support for COM aggregation to mk protocol handler.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/mk.c | 73 ++++++++++++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 54 insertions(+), 20 deletions(-)

2 1

[PATCH 7/8] urlmon: Added support for COM aggregation to ftp protocol handler.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/ftp.c | 71 ++++++++++++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 53 insertions(+), 19 deletions(-)

1 0

[PATCH 6/8] urlmon: Added support for COM aggregation to http protocol handler.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/http.c | 80 +++++++++++++++++++++++++++++++------------- dlls/urlmon/tests/protocol.c | 2 ++ 2 files changed, 59 insertions(+), 23 deletions(-)

1 0

[PATCH 5/8] urlmon: Added support for COM aggregation of file protocol handler.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/file.c | 59 ++++++++++++++++++++++++++++++++-------- dlls/urlmon/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 28 +++++++++++++------ 3 files changed, 133 insertions(+), 19 deletions(-)

1 0

[PATCH 4/8] urlmon: Release protocol handler in BindProtocol::Terminate.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 35 ++++++++++++++++++++++++++++++++--- dlls/urlmon/tests/protocol.c | 10 ++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-)

1 0

[PATCH 3/8] urlmon: Don't store IWinInetInfo reference in BindProtocol.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/binding.c | 29 ++++++++++++++++++++++++----- dlls/urlmon/bindprot.c | 11 +---------- dlls/urlmon/session.c | 13 ++----------- dlls/urlmon/urlmon_main.h | 3 +-- 4 files changed, 28 insertions(+), 28 deletions(-)

1 0

[PATCH 2/8] urlmon: Don't store IWinInetHttpInfo reference in BindProtocol.
by Jacek Caban May 8, 2018

May 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/binding.c | 31 ++++++++++++++++++++++++------- dlls/urlmon/bindprot.c | 5 ----- dlls/urlmon/urlmon_main.h | 1 - 3 files changed, 24 insertions(+), 13 deletions(-)

1 0