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

Zebediah Figura : user32: Return HID devices in GetRawInputDeviceList().
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: wine Branch: master Commit: 85d5fc23b4cf6d369115802725e211d0c1195ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d5fc23b4cf6d3691158027… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:41 2018 -0500 user32: Return HID devices in GetRawInputDeviceList(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- dlls/user32/rawinput.c | 138 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/user_private.h | 12 ++++ 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 81cde06..d420dcb 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = imm32 usp10 +DELAYIMPORTS = hid imm32 setupapi usp10 C_SRCS = \ button.c \ diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index bd5fbf4..91dcff4 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -27,7 +27,10 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "winreg.h" #include "winuser.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" @@ -35,11 +38,130 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); +struct hid_device +{ + WCHAR *path; + HANDLE file; +}; + +static struct hid_device *hid_devices; +static unsigned int hid_devices_count, hid_devices_max; + +static CRITICAL_SECTION hid_devices_cs; +static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = +{ + 0, 0, &hid_devices_cs, + { &hid_devices_cs_debug.ProcessLocksList, &hid_devices_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": hid_devices_cs") } +}; +static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; + +static void find_hid_devices(void) +{ + static ULONGLONG last_check; + + SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + DWORD detail_size, needed; + DWORD idx, didx; + GUID hid_guid; + HDEVINFO set; + HANDLE file; + WCHAR *path; + + if (GetTickCount64() - last_check < 2000) + return; + last_check = GetTickCount64(); + + HidD_GetHidGuid(&hid_guid); + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + detail_size = sizeof(*detail) + (MAX_PATH * sizeof(WCHAR)); + if (!(detail = heap_alloc(detail_size))) + return; + detail->cbSize = sizeof(*detail); + + EnterCriticalSection(&hid_devices_cs); + + /* destroy previous list */ + for (didx = 0; didx < hid_devices_count; ++didx) + { + CloseHandle(hid_devices[didx].file); + heap_free(hid_devices[didx].path); + } + + didx = 0; + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) + { + if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, &needed, NULL)) + { + if (!(detail = heap_realloc(detail, needed))) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + detail_size = needed; + + SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, NULL, NULL); + } + + if (!(path = heap_strdupW(detail->DevicePath))) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Failed to open device file %s, error %u.\n", debugstr_w(path), GetLastError()); + heap_free(path); + continue; + } + + if (didx >= hid_devices_max) + { + if (hid_devices) + { + hid_devices_max *= 2; + hid_devices = heap_realloc(hid_devices, + hid_devices_max * sizeof(hid_devices[0])); + } + else + { + hid_devices_max = 8; + hid_devices = heap_alloc(hid_devices_max * sizeof(hid_devices[0])); + } + if (!hid_devices) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + } + + TRACE("Found HID device %s.\n", debugstr_w(path)); + + hid_devices[didx].path = path; + hid_devices[didx].file = file; + + didx++; + } + hid_devices_count = didx; + +done: + LeaveCriticalSection(&hid_devices_cs); + heap_free(detail); +} + /*********************************************************************** * GetRawInputDeviceList (USER32.@) */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { + UINT i; + TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); if (size != sizeof(*devices)) @@ -54,16 +176,18 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } + find_hid_devices(); + if (!devices) { - *device_count = 2; + *device_count = 2 + hid_devices_count; return 0; } - if (*device_count < 2) + if (*device_count < 2 + hid_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2; + *device_count = 2 + hid_devices_count; return ~0U; } @@ -72,7 +196,13 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun devices[1].hDevice = WINE_KEYBOARD_HANDLE; devices[1].dwType = RIM_TYPEKEYBOARD; - return 2; + for (i = 0; i < hid_devices_count; ++i) + { + devices[2 + i].hDevice = &hid_devices[i]; + devices[2 + i].dwType = RIM_TYPEHID; + } + + return 2 + hid_devices_count; } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a70ae9..73a2bad 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -28,6 +28,8 @@ #include "winuser.h" #include "winreg.h" #include "winternl.h" +#include "wine/heap.h" +#include "wine/unicode.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) @@ -354,4 +356,14 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #define assert(expr) ((void)0) #endif +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} + #endif /* __WINE_USER_PRIVATE_H */

1 0

Zebediah Figura : user32: Move rawinput functions to rawinput.c.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: wine Branch: master Commit: 6f3fb8c3f2061743f7f4b3c58bd00063949e51ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3fb8c3f2061743f7f4b3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:39 2018 -0500 user32: Move rawinput functions to rawinput.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/input.c | 251 ------------------------------------------ dlls/user32/rawinput.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f3fb8c3f2061743f7f4…

1 0

Zebediah Figura : user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo().
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: wine Branch: master Commit: 44551cfe19f93fffb515b082871a35ae58c09fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44551cfe19f93fffb515b082… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:43 2018 -0500 user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 12a0e15..cf3028a 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -365,11 +365,17 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT s = sizeof(mouse_name); name = mouse_name; } - else + else if (device == WINE_KEYBOARD_HANDLE) { s = sizeof(keyboard_name); name = keyboard_name; } + else + { + hid_device = device; + s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + name = hid_device->path; + } break; case RIDI_DEVICEINFO: s = sizeof(*info);

1 0

Michael Stefaniuc : msi: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: wine Branch: master Commit: a9cb67bb7ffb5b25469ba6a732f8913ac8778c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9cb67bb7ffb5b25469ba6a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 21:15:43 2018 +0200 msi: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cb67bb7ffb5b25469b…

1 0

Zebediah Figura : user32: Trace command in hexadecimal in GetRawDeviceInfo ().
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: wine Branch: master Commit: 9e4e594972b0b01beb94e6f143ea46643205bf0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4e594972b0b01beb94e6f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:40 2018 -0500 user32: Trace command in hexadecimal in GetRawDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5ce42f6..bd5fbf4 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -177,7 +177,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT { UINT ret; - TRACE("device %p, command %u, data %p, data_size %p.\n", + TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); ret = GetRawInputDeviceInfoW(device, command, data, data_size); @@ -201,7 +201,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT RID_DEVICE_INFO *info; UINT s; - TRACE("device %p, command %u, data %p, data_size %p.\n", + TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U;

1 0

Francois Gouget : testbot/WineRunWineTest: Use the new WineTest command line options.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: tools Branch: master Commit: ed6b46099fc250ff2ebd57a279902bbed9c2c6e8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ed6b46099fc250ff2ebd57a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:57:11 2018 +0200 testbot/WineRunWineTest: Use the new WineTest command line options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6c0c923..ac55946 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -428,7 +428,7 @@ if ($Step->Type eq "suite") my $Tag = lc($VM->Name); $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= $Task->CmdLineArg .",submit winetest $TagPrefix-$Tag "; + $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -444,7 +444,7 @@ if ($Step->Type eq "suite") } else { - $Script .= $Task->CmdLineArg ." build patch.diff"; + $Script .= "--testpatch ". $Task->CmdLineArg ." patch.diff"; } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot: Always recognize 'Task:' status lines in the logs.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: tools Branch: master Commit: 2100194a5c76389c4242bce5cc1253958ee9d244 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2100194a5c76389c4242bce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:07 2018 +0200 testbot: Always recognize 'Task:' status lines in the logs. This opens the door to standardizing the format of the status lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6f9a27..d39c81b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^$ResultPrefix: ok$/) + if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/) + elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^$ResultPrefix: /) + elsif ($Line =~ /^(?:$ResultPrefix|Task): /) { $Result = "failed"; }

1 0

Francois Gouget : testbot/WineRunBuild: Use the new Build command line options.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: tools Branch: master Commit: 325227c2ef9bf7ba435b90ae284ae89b8c199dbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=325227c2ef9bf7ba435b90a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:57:16 2018 +0200 testbot/WineRunBuild: Use the new Build command line options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c681d2e..32369b1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,7 +363,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))

1 0

Francois Gouget : testbot/Build: There is no need to create build-native.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: tools Branch: master Commit: 3fdc4b088ebf9cf981b14e3091a1057c35292def URL: https://source.winehq.org/git/tools.git/?a=commit;h=3fdc4b088ebf9cf981b14e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:57 2018 +0200 testbot/Build: There is no need to create build-native. That directory is created by Reconfig.pl which must be run before Build.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b729d95..e1133aa 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -132,8 +132,6 @@ sub ApplyPatch($) sub BuildNative() { - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - InfoMsg "\nRebuilding native tools\n"; system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__");

1 0

Francois Gouget : testbot/WineRunWine*: Better check the step type.
by Alexandre Julliard Aug. 21, 2018

Aug. 21, 2018

Module: tools Branch: master Commit: d607738c760a00556f49772a27c7d29472619be4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d607738c760a00556f49772… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:29 2018 +0200 testbot/WineRunWine*: Better check the step type. This can help avoid errors when testing the script manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 6 +++++- testbot/bin/WineRunWineTest.pl | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 47e4b3b..c681d2e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "patch") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7278bcd..2301804 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "reconfig") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "none") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 204f863..27dd8e7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -381,9 +381,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "single" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ee4c853..6c0c923 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -382,10 +382,14 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if (($Step->Type eq "suite" and $Step->FileType ne "none") or ($Step->Type ne "suite" and $Step->FileType ne "patch")) { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); }

1 0