Module: vkd3d
Branch: master
Commit: 1c2344818d433adc2d2d88379611544770cef2bc
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c2344818d433adc2d2d883…
Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date: Thu Oct 15 15:27:25 2020 -0500
vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
To more closely match the behaviour of D3D_SHADER_MACRO.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
include/vkd3d_shader.h | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 74e2eb0..03225d3 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -635,12 +635,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info
struct vkd3d_shader_macro
{
/**
- * A null-terminated string containing the name of a macro. This macro must
- * not be a parameterized (i.e. function-like) macro. If this field is not a
- * valid macro identifier, it will be ignored.
+ * Pointer to a null-terminated string containing the name of a macro. This
+ * macro must not be a parameterized (i.e. function-like) macro. If this
+ * field is not a valid macro identifier, this macro will be ignored.
*/
const char *name;
- /** A null-terminated string containing the expansion of the macro. */
+ /**
+ * Optional pointer to a null-terminated string containing the expansion of
+ * the macro. This field may be set to NULL, in which case the macro has an
+ * empty expansion.
+ */
const char *value;
};
@@ -713,7 +717,7 @@ struct vkd3d_shader_preprocess_info
* be expanded as if a corresponding #define statement were prepended to the
* source code.
*
- * If the same macro is specified multiple times, only the first value is
+ * If the same macro is specified multiple times, only the last value is
* used.
*/
const struct vkd3d_shader_macro *macros;
Module: vkd3d
Branch: master
Commit: 5d9398e10ca38df956e746d4ee51f6c71d56819a
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d9398e10ca38df956e746d…
Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date: Thu Oct 15 15:24:32 2020 -0500
include: Clarify that struct vkd3d_shader_code is not null-terminated.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
include/vkd3d_shader.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 7b95896..74e2eb0 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -155,7 +155,13 @@ enum vkd3d_shader_visibility
/** A generic structure containing a GPU shader, in text or byte-code format. */
struct vkd3d_shader_code
{
- /** Pointer to the code. */
+ /**
+ * Pointer to the code. Note that textual formats are not null-terminated.
+ * Therefore \a size should not include a null terminator, when this
+ * structure is passed as input to a vkd3d-shader function, and the
+ * allocated string will not include a null terminator when this structure
+ * is used as output.
+ */
const void *code;
/** Size of \a code, in bytes. */
size_t size;
Module: wine
Branch: master
Commit: 8e54cad6a15b3901a748fa228d1a7e456911b9ca
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e54cad6a15b3901a748fa22…
Author: Aaron Hill <aa1ronham(a)gmail.com>
Date: Mon Oct 12 17:36:05 2020 -0400
cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
Previously, invoking 'call' with an empty string would leave errorlevel
unchanged. Reset errorlevel to 0 to match the behavior of
the Windows 'cmd.exe'.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982
Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
programs/cmd/tests/test_builtins.cmd | 3 +++
programs/cmd/wcmdmain.c | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 73b0917c275..c7418b759e4 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7
if errorlevel 7 echo setting var worked too well, bad
call :setError 3
echo %ErrorLevel% should still be 7
+rem Verify that (call ) sets errorlevel to 0
+(call )
+if errorlevel 1 echo errorlevel should have been 0
echo ------------ Testing GOTO ------------
if a==a goto dest1
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 47e43fcd675..2b55a39dca3 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1053,6 +1053,11 @@ void WCMD_run_program (WCHAR *command, BOOL called)
firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE);
if (!firstParam) return;
+ if (!firstParam[0]) {
+ errorlevel = 0;
+ return;
+ }
+
/* Calculate the search path and stem to search for */
if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */
static const WCHAR curDir[] = {'.',';','\0'};
Module: wine
Branch: master
Commit: 8a70e7eba178614ccaa992bf5551d5986dd0d953
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a70e7eba178614ccaa992bf…
Author: Austin English <austinenglish(a)gmail.com>
Date: Wed Oct 14 03:39:27 2020 -0500
dsdmo: Add a version resource.
Signed-off-by: Austin English <austinenglish(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/dsdmo/Makefile.in | 2 ++
dlls/dsdmo/version.rc | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in
index d184b025ad0..d86dbbd804a 100644
--- a/dlls/dsdmo/Makefile.in
+++ b/dlls/dsdmo/Makefile.in
@@ -8,3 +8,5 @@ C_SRCS = \
IDL_SRCS = \
dsdmo.idl
+
+RC_SRCS = version.rc
diff --git a/dlls/dsdmo/version.rc b/dlls/dsdmo/version.rc
new file mode 100644
index 00000000000..77cc1728fbf
--- /dev/null
+++ b/dlls/dsdmo/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 Austin English
+ *
+ * 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
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine dsdmo"
+#define WINE_FILENAME_STR "dsdmo.dll"
+#define WINE_FILEVERSION 5,3,2600,5512
+#define WINE_FILEVERSION_STR "5.3.2600.5512"
+#define WINE_PRODUCTVERSION 5,3,2600,5512
+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
+
+#include "wine/wine_common_ver.rc"
Module: wine
Branch: master
Commit: 1737a7878f034534fb8eb908e6940cffe55494b1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1737a7878f034534fb8eb908…
Author: Austin English <austinenglish(a)gmail.com>
Date: Wed Oct 14 03:38:41 2020 -0500
qasf: Add a version resource.
Signed-off-by: Austin English <austinenglish(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/qasf/Makefile.in | 2 ++
dlls/qasf/version.rc | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in
index 39239d38aea..928bf04d80e 100644
--- a/dlls/qasf/Makefile.in
+++ b/dlls/qasf/Makefile.in
@@ -10,3 +10,5 @@ C_SRCS = \
IDL_SRCS = \
qasf_classes.idl
+
+RC_SRCS = version.rc
diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc
new file mode 100644
index 00000000000..dab46194395
--- /dev/null
+++ b/dlls/qasf/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 Austin English
+ *
+ * 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
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine qasf"
+#define WINE_FILENAME_STR "qasf.dll"
+#define WINE_FILEVERSION 9,0,0,4503
+#define WINE_FILEVERSION_STR "9.0.0.4503"
+#define WINE_PRODUCTVERSION 9,0,0,4503
+#define WINE_PRODUCTVERSION_STR "9.0.0.4503"
+
+#include "wine/wine_common_ver.rc"
Module: wine
Branch: master
Commit: c130054120cffe595e21f43d5e7d2202f23c91a4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130054120cffe595e21f43d…
Author: Austin English <austinenglish(a)gmail.com>
Date: Wed Oct 14 03:36:22 2020 -0500
qedit: Add a version resource.
Signed-off-by: Austin English <austinenglish(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/qedit/Makefile.in | 2 ++
dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 4891328c7a9..4eb57322f5e 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -11,3 +11,5 @@ C_SRCS = \
timeline.c
IDL_SRCS = qedit_classes.idl
+
+RC_SRCS = version.rc
diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc
new file mode 100644
index 00000000000..dd5f3ccbc7f
--- /dev/null
+++ b/dlls/qedit/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 Austin English
+ *
+ * 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
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine qedit"
+#define WINE_FILENAME_STR "qedit.dll"
+#define WINE_FILEVERSION 5,3,2600,5512
+#define WINE_FILEVERSION_STR "5.3.2600.5512"
+#define WINE_PRODUCTVERSION 5,3,2600,5512
+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
+
+#include "wine/wine_common_ver.rc"