Module: tools
Branch: master
Commit: 08e407ef42f578d66e89fda1ed3125c73a6175a1
URL: https://source.winehq.org/git/tools.git/?a=commit;h=08e407ef42f578d66e89fda…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Feb 5 02:01:30 2020 +0100
testbot/LogUtils: Reorder the functions to get a more logical grouping.
Add headers to each section.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/lib/WineTestBot/LogUtils.pm | 185 ++++++++++++++++++------------------
1 file changed, 92 insertions(+), 93 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 0a98a5a..66359a9 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -63,6 +63,78 @@ sub _IsPerlError($)
$Str =~ /^Possible precedence issue /;
}
+=pod
+=over 12
+
+=item C<GetLogLineCategory()>
+
+Identifies the category of the given log line: an error message, a Wine
+diagnostic line, a TestBot error, etc.
+
+The category can then be used to decide whether to hide the line or, on
+the contrary, highlight it.
+
+=back
+=cut
+
+sub GetLogLineCategory($)
+{
+ my ($Line) = @_;
+
+ if (# Build messages
+ $Line =~ /^\+ \S/ or
+ $Line =~ /^LANG=/ or
+ $Line =~ /^Running (?:the tests|WineTest) / or
+ $Line =~ /^Task: (?:ok|tests|Updated)/)
+ {
+ return "info";
+ }
+ if (# Git errors
+ $Line =~ /^CONFLICT / or
+ $Line =~ /^error: patch failed:/ or
+ $Line =~ /^error: corrupt patch / or
+ # Build errors
+ $Line =~ /: error: / or
+ $Line =~ /: undefined reference to `/ or
+ $Line =~ /^make: [*]{3} No rule to make target / or
+ $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
+ $Line =~ /^Task: / or
+ # Typical perl errors
+ _IsPerlError($Line))
+ {
+ return "error";
+ }
+ if ($Line =~ /:winediag:/)
+ {
+ if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree
+ # calls it as a test.
+ $Line =~ /CorIsLatestSvc If this function is called,/ or
+ # VMs and most test machines don't have a midi port.
+ $Line =~ /No software synthesizer midi port found,/ or
+ # Most VMs have limited OpenGL support.
+ $Line =~ /None of the requested D3D feature levels is supported / or
+ # The tests are not run as root.
+ $Line =~ /this requires special permissions/)
+ {
+ return "diag";
+ }
+ return "error";
+ }
+ if (# TestBot script error messages
+ $Line =~ /^[a-zA-Z.]+:error: / or
+ # TestBot error
+ $Line =~ /^BotError:/ or
+ $Line =~ /^Error:/ or
+ # X errors
+ $Line =~ /^X Error of failed request: / or
+ $Line =~ / opcode of failed request: /)
+ {
+ return "boterror";
+ }
+
+ return "none";
+}
+
=pod
=over 12
@@ -138,13 +210,17 @@ sub ParseTaskLog($)
}
+#
+# WineTest report parser
+#
+
=pod
=over 12
-=item C<GetLogLineCategory()>
+=item C<GetReportLineCategory()>
-Identifies the category of the given log line: an error message, a Wine
-diagnostic line, a TestBot error, etc.
+Identifies the category of the given test report line: an error message,
+a todo, just an informational message or none of these.
The category can then be used to decide whether to hide the line or, on
the contrary, highlight it.
@@ -152,69 +228,36 @@ the contrary, highlight it.
=back
=cut
-sub GetLogLineCategory($)
+sub GetReportLineCategory($)
{
my ($Line) = @_;
- if (# Build messages
- $Line =~ /^\+ \S/ or
- $Line =~ /^LANG=/ or
- $Line =~ /^Running (?:the tests|WineTest) / or
- $Line =~ /^Task: (?:ok|tests|Updated)/)
+ if ($Line =~ /: Test marked todo: /)
{
- return "info";
+ return "todo";
}
- if (# Git errors
- $Line =~ /^CONFLICT / or
- $Line =~ /^error: patch failed:/ or
- $Line =~ /^error: corrupt patch / or
- # Build errors
- $Line =~ /: error: / or
- $Line =~ /: undefined reference to `/ or
- $Line =~ /^make: [*]{3} No rule to make target / or
- $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
- $Line =~ /^Task: / or
- # Typical perl errors
- _IsPerlError($Line))
+ if ($Line =~ /: Tests skipped: / or
+ $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /)
{
- return "error";
+ return "skip";
}
- if ($Line =~ /:winediag:/)
+ if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or
+ $Line =~ /Fatal: test .* does not exist/ or
+ $Line =~ / done \(258\)/ or
+ $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or
+ $Line =~ /^Unhandled exception: /)
{
- if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree
- # calls it as a test.
- $Line =~ /CorIsLatestSvc If this function is called,/ or
- # VMs and most test machines don't have a midi port.
- $Line =~ /No software synthesizer midi port found,/ or
- # Most VMs have limited OpenGL support.
- $Line =~ /None of the requested D3D feature levels is supported / or
- # The tests are not run as root.
- $Line =~ /this requires special permissions/)
- {
- return "diag";
- }
return "error";
}
- if (# TestBot script error messages
- $Line =~ /^[a-zA-Z.]+:error: / or
- # TestBot error
- $Line =~ /^BotError:/ or
- $Line =~ /^Error:/ or
- # X errors
- $Line =~ /^X Error of failed request: / or
- $Line =~ / opcode of failed request: /)
+ if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /)
{
- return "boterror";
+ return "info";
}
return "none";
}
-#
-# WineTest report parser
-#
-
sub _NewCurrentUnit($$)
{
my ($Dll, $Unit) = @_;
@@ -553,50 +596,6 @@ sub ParseWineTestReport($$$)
}
-=pod
-=over 12
-
-=item C<GetReportLineCategory()>
-
-Identifies the category of the given test report line: an error message,
-a todo, just an informational message or none of these.
-
-The category can then be used to decide whether to hide the line or, on
-the contrary, highlight it.
-
-=back
-=cut
-
-sub GetReportLineCategory($)
-{
- my ($Line) = @_;
-
- if ($Line =~ /: Test marked todo: /)
- {
- return "todo";
- }
- if ($Line =~ /: Tests skipped: / or
- $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /)
- {
- return "skip";
- }
- if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or
- $Line =~ /Fatal: test .* does not exist/ or
- $Line =~ / done \(258\)/ or
- $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or
- $Line =~ /^Unhandled exception: /)
- {
- return "error";
- }
- if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /)
- {
- return "info";
- }
-
- return "none";
-}
-
-
#
# Log querying and formatting
#
Module: wine
Branch: master
Commit: 829dff0ee770f720ee90976faac3cbd6bb2afc59
URL: https://source.winehq.org/git/wine.git/?a=commit;h=829dff0ee770f720ee90976f…
Author: Brendan Shanks <bshanks(a)codeweavers.com>
Date: Tue Feb 4 12:11:44 2020 -0800
wbemuuid: Add library.
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
configure | 2 ++
configure.ac | 1 +
dlls/wbemuuid/Makefile.in | 4 ++++
dlls/wbemuuid/wbemuuid.c | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 42 insertions(+)
diff --git a/configure b/configure
index c7e8f5ef1f..80235dd995 100755
--- a/configure
+++ b/configure
@@ -1617,6 +1617,7 @@ enable_vssapi
enable_vulkan_1
enable_wbemdisp
enable_wbemprox
+enable_wbemuuid
enable_wdscore
enable_webservices
enable_wer
@@ -20930,6 +20931,7 @@ wine_fn_config_makefile dlls/wbemdisp enable_wbemdisp
wine_fn_config_makefile dlls/wbemdisp/tests enable_tests
wine_fn_config_makefile dlls/wbemprox enable_wbemprox
wine_fn_config_makefile dlls/wbemprox/tests enable_tests
+wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid
wine_fn_config_makefile dlls/wdscore enable_wdscore
wine_fn_config_makefile dlls/webservices enable_webservices
wine_fn_config_makefile dlls/webservices/tests enable_tests
diff --git a/configure.ac b/configure.ac
index f9ca95ce49..40374210bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3739,6 +3739,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp)
WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests)
WINE_CONFIG_MAKEFILE(dlls/wbemprox)
WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests)
+WINE_CONFIG_MAKEFILE(dlls/wbemuuid)
WINE_CONFIG_MAKEFILE(dlls/wdscore)
WINE_CONFIG_MAKEFILE(dlls/webservices)
WINE_CONFIG_MAKEFILE(dlls/webservices/tests)
diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in
new file mode 100644
index 0000000000..449a0e68a8
--- /dev/null
+++ b/dlls/wbemuuid/Makefile.in
@@ -0,0 +1,4 @@
+MODULE = libwbemuuid.a
+
+C_SRCS = \
+ wbemuuid.c
diff --git a/dlls/wbemuuid/wbemuuid.c b/dlls/wbemuuid/wbemuuid.c
new file mode 100644
index 0000000000..8fc3314d8d
--- /dev/null
+++ b/dlls/wbemuuid/wbemuuid.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Brendan Shanks for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "dispex.h"
+#include "objbase.h"
+#include "oleauto.h"
+#include "olectl.h"
+
+#include "initguid.h"
+
+#include "wbemcli.h"
+#include "wbemprov.h"
+#include "wbemdisp.h"