December 2017 - Wine-Commits

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: afbf4c7053bc1a11ae8b901f9c7dd033db37a445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbf4c7053bc1a11ae8b901f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 15 16:28:18 2017 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 172 +++++++++++++++------------------------------------------------ 1 file changed, 39 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afbf4c7053bc1a11ae8b9…

1 0

Alexandre Julliard : cabinet: Treat only -1 as an error from the FDICopy callback.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: 5cb30bbf6ef754e589c2ddfc42ae7a9cf06ace21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb30bbf6ef754e589c2ddfc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 18:47:14 2017 +0100 cabinet: Treat only -1 as an error from the FDICopy callback. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 4 ++-- dlls/cabinet/tests/fdi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 758133e..777174b 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2496,7 +2496,7 @@ BOOL __cdecl FDICopy( fdin.psz2 = (CAB(mii).nextinfo) ? CAB(mii).nextinfo : &emptystring; fdin.psz3 = pszCabPath; - if (((*pfnfdin)(fdintCABINET_INFO, &fdin))) { + if (pfnfdin(fdintCABINET_INFO, &fdin) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); goto bail_and_fail; } @@ -2623,7 +2623,7 @@ BOOL __cdecl FDICopy( fdin.psz2 = (CAB(mii).prevname) ? CAB(mii).prevname : &emptystring; fdin.psz3 = (CAB(mii).previnfo) ? CAB(mii).previnfo : &emptystring; - if (((*pfnfdin)(fdintPARTIAL_FILE, &fdin))) { + if (pfnfdin(fdintPARTIAL_FILE, &fdin) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); goto bail_and_fail; } diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index ba622f6..80f6a3c 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -744,7 +744,7 @@ static void test_FDIIsCabinet(void) static INT_PTR __cdecl CopyProgress(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - return 0; + return 37; /* doc says 0, but anything != -1 apparently means success as well */ } static INT_PTR CDECL fdi_mem_open(char *name, int oflag, int pmode)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: 6e80ac1d60b3a43a40b859a1b365751d1cc24839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e80ac1d60b3a43a40b859a1b… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:04:06 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/po/de.po b/po/de.po index ae2eae7..d1f6215 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-17 14:31+0100\n" +"PO-Revision-Date: 2017-12-15 16:04+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8939,10 +8939,8 @@ msgid " sec" msgstr " Sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Ordner auswählen" +msgstr "Quelle auswählen" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -12092,17 +12090,6 @@ msgid "Icons (*.ico)" msgstr "Symbole (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12118,7 +12105,7 @@ msgstr "" " REG [Operation] [Parameter]\n" "\n" "Unterstützte Operationen:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Hilfe für eine spezifische Operation:\n" " REG [Operation] /?\n" @@ -12262,22 +12249,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT datei.reg\n" +msgstr "REG EXPORT Schlüssel datei.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Ungültiger Systemschlüssel [%1]\n" +msgstr "reg: Ungültiger Systemschlüssel [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" +msgstr "Die Datei '%1' existiert bereits. Möchten Sie sie ersetzen?" #: regedit.rc:34 msgid "&Registry"

1 0

Józef Kucia : include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: vkd3d Branch: master Commit: f8c20beede23609eb240499fa657a6f62c8853eb URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=f8c20beede23609eb240499f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:20 2017 +0100 include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined. Allows using vkd3d with other Win32 headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 8cc9a67..941663f 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -19,8 +19,11 @@ #ifndef __VKD3D_H #define __VKD3D_H -#include "vkd3d_windows.h" -#include "d3d12.h" +#ifndef VKD3D_NO_WIN32_TYPES +# include "vkd3d_windows.h" +# include "d3d12.h" +#endif /* VKD3D_NO_WIN32_TYPES */ + #include <vulkan/vulkan.h> #include <stdbool.h>

1 0

Józef Kucia : libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: vkd3d Branch: master Commit: 4ae6285c8ee5f0fd0b3c78333f26f32ee2c74390 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=4ae6285c8ee5f0fd0b3c7833… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:19 2017 +0100 libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions. Per the SPIR-V spec: "Result Type must be a scalar of integer type or floating-point type." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e749873..6fd198b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2616,6 +2616,25 @@ static void vkd3d_dxbc_compiler_emit_store_dst_components(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_store_dst_scalar(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst, uint32_t val_id, + enum vkd3d_component_type component_type, DWORD swizzle) +{ + unsigned int component_count = vkd3d_write_mask_component_count(dst->write_mask); + uint32_t component_ids[VKD3D_VEC4_SIZE]; + unsigned int component_idx, i; + + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); + for (i = 0; i < component_count; ++i) + { + if (vkd3d_swizzle_get_component(swizzle, component_idx + i)) + ERR("Invalid swizzle %#x for scalar value, write mask %#x.\n", swizzle, dst->write_mask); + + component_ids[i] = val_id; + } + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, component_ids); +} + static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *compiler, uint32_t target_id, SpvBuiltIn builtin) { @@ -4641,7 +4660,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); - sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); ref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ @@ -4652,7 +4671,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil image.sampled_image_id, coordinate_id, ref_id, operands_mask, image_operands, image_operand_count); - vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + vkd3d_dxbc_compiler_emit_store_dst_scalar(compiler, dst, val_id, image.sampled_type, src[1].swizzle); }

1 0

Józef Kucia : include: Avoid including vkd3d_windows.h when real windows.h is included.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: vkd3d Branch: master Commit: 6671e79082998fec1ad665f9b24ab2d7577855a0 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=6671e79082998fec1ad665f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:22 2017 +0100 include: Avoid including vkd3d_windows.h when real windows.h is included. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 09c30f6..3b1f92a 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -18,6 +18,7 @@ #ifndef __VKD3D_WINDOWS_H #define __VKD3D_WINDOWS_H +#ifndef _INC_WINDOWS #if !defined(_WIN32) || defined(__WIDL__) @@ -238,4 +239,5 @@ extern "C++" \ #endif #endif /* DEFINE_ENUM_FLAG_OPERATORS */ +#endif /* _INC_WINDOWS */ #endif /* __VKD3D_WINDOWS_H */

1 0

Józef Kucia : include: Prefix public header file names with vkd3d.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: vkd3d Branch: master Commit: abff3ca469e971ce544af21f993cd1c85bbdd93a URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=abff3ca469e971ce544af21f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:21 2017 +0100 include: Prefix public header file names with vkd3d. Prevents possible clashes when using vkd3d with external Win32 headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 22 +++++++++++----------- demos/demo.h | 2 +- demos/demo_win32.h | 2 +- include/.gitignore | 16 ++++++++-------- include/vkd3d.h | 2 +- include/{d3d12.idl => vkd3d_d3d12.idl} | 4 ++-- include/{dxgi.idl => vkd3d_dxgi.idl} | 4 ++-- include/{dxgi1_2.idl => vkd3d_dxgi1_2.idl} | 2 +- include/{dxgi1_3.idl => vkd3d_dxgi1_3.idl} | 2 +- include/{dxgi1_4.idl => vkd3d_dxgi1_4.idl} | 2 +- include/{dxgibase.idl => vkd3d_dxgibase.idl} | 2 +- include/{dxgiformat.idl => vkd3d_dxgiformat.idl} | 0 include/{dxgitype.idl => vkd3d_dxgitype.idl} | 2 +- include/{unknown.idl => vkd3d_unknown.idl} | 0 tests/d3d12.c | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9e1f854..4d32b2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,22 +3,22 @@ AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private widl_headers = \ - include/d3d12.h \ - include/dxgi.h \ - include/dxgi1_2.h \ - include/dxgi1_3.h \ - include/dxgi1_4.h \ - include/dxgibase.h \ - include/dxgiformat.h \ - include/dxgitype.h + include/vkd3d_d3d12.h \ + include/vkd3d_dxgi.h \ + include/vkd3d_dxgi1_2.h \ + include/vkd3d_dxgi1_3.h \ + include/vkd3d_dxgi1_4.h \ + include/vkd3d_dxgibase.h \ + include/vkd3d_dxgiformat.h \ + include/vkd3d_dxgitype.h vkd3d_public_headers = \ - include/d3d12.h \ include/dummy/rpc.h \ include/dummy/rpcndr.h \ - include/dxgibase.h \ - include/dxgiformat.h \ include/vkd3d.h \ + include/vkd3d_d3d12.h \ + include/vkd3d_dxgibase.h \ + include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h diff --git a/demos/demo.h b/demos/demo.h index dc36d10..4645bd7 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -36,7 +36,7 @@ #include <vkd3d_windows.h> #define WIDL_C_INLINE_WRAPPERS #define COBJMACROS -#include <d3d12.h> +#include <vkd3d_d3d12.h> #include <inttypes.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x)) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index addcc95..3b61bcf 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <dxgi1_4.h> +#include <vkd3d_dxgi1_4.h> #include <stdbool.h> #include <stdio.h> diff --git a/include/.gitignore b/include/.gitignore index b7ead08..17852a8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,11 +1,11 @@ config.h config.h.in -d3d12.h -dxgi.h -dxgi1_2.h -dxgi1_3.h -dxgi1_4.h -dxgibase.h -dxgiformat.h -dxgitype.h stamp-h1 +vkd3d_d3d12.h +vkd3d_dxgi.h +vkd3d_dxgi1_2.h +vkd3d_dxgi1_3.h +vkd3d_dxgi1_4.h +vkd3d_dxgibase.h +vkd3d_dxgiformat.h +vkd3d_dxgitype.h diff --git a/include/vkd3d.h b/include/vkd3d.h index 941663f..f6872c3 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -21,7 +21,7 @@ #ifndef VKD3D_NO_WIN32_TYPES # include "vkd3d_windows.h" -# include "d3d12.h" +# include "vkd3d_d3d12.h" #endif /* VKD3D_NO_WIN32_TYPES */ #include <vulkan/vulkan.h> diff --git a/include/d3d12.idl b/include/vkd3d_d3d12.idl similarity index 99% rename from include/d3d12.idl rename to include/vkd3d_d3d12.idl index 07218cd..4242daf 100644 --- a/include/d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -18,9 +18,9 @@ import "vkd3d_windows.h"; -import "dxgibase.idl"; +import "vkd3d_dxgibase.idl"; -#include "unknown.idl" +#include "vkd3d_unknown.idl" const UINT D3D12_CS_TGSM_REGISTER_COUNT = 8192; const UINT D3D12_MAX_ROOT_COST = 64; diff --git a/include/dxgi.idl b/include/vkd3d_dxgi.idl similarity index 98% rename from include/dxgi.idl rename to include/vkd3d_dxgi.idl index 746e000..5b80e1f 100644 --- a/include/dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgitype.idl"; +import "vkd3d_dxgitype.idl"; -#include "unknown.idl" +#include "vkd3d_unknown.idl" typedef enum DXGI_SWAP_EFFECT { diff --git a/include/dxgi1_2.idl b/include/vkd3d_dxgi1_2.idl similarity index 99% rename from include/dxgi1_2.idl rename to include/vkd3d_dxgi1_2.idl index dbee994..e7f951a 100644 --- a/include/dxgi1_2.idl +++ b/include/vkd3d_dxgi1_2.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi.idl"; +import "vkd3d_dxgi.idl"; typedef enum DXGI_SCALING { diff --git a/include/dxgi1_3.idl b/include/vkd3d_dxgi1_3.idl similarity index 98% rename from include/dxgi1_3.idl rename to include/vkd3d_dxgi1_3.idl index 85a6e1e..88ac0a3 100644 --- a/include/dxgi1_3.idl +++ b/include/vkd3d_dxgi1_3.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi1_2.idl"; +import "vkd3d_dxgi1_2.idl"; typedef struct DXGI_MATRIX_3X2_F DXGI_MATRIX_3X2_F; diff --git a/include/dxgi1_4.idl b/include/vkd3d_dxgi1_4.idl similarity index 98% rename from include/dxgi1_4.idl rename to include/vkd3d_dxgi1_4.idl index 908bd9b..ccd2224 100644 --- a/include/dxgi1_4.idl +++ b/include/vkd3d_dxgi1_4.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi1_3.idl"; +import "vkd3d_dxgi1_3.idl"; [ local, diff --git a/include/dxgibase.idl b/include/vkd3d_dxgibase.idl similarity index 97% rename from include/dxgibase.idl rename to include/vkd3d_dxgibase.idl index 86ba5dc..93f931e 100644 --- a/include/dxgibase.idl +++ b/include/vkd3d_dxgibase.idl @@ -18,7 +18,7 @@ import "vkd3d_windows.h"; -import "dxgiformat.idl"; +import "vkd3d_dxgiformat.idl"; cpp_quote("#ifndef DXGI_ERROR_INVALID_CALL") cpp_quote("#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001)") diff --git a/include/dxgiformat.idl b/include/vkd3d_dxgiformat.idl similarity index 100% rename from include/dxgiformat.idl rename to include/vkd3d_dxgiformat.idl diff --git a/include/dxgitype.idl b/include/vkd3d_dxgitype.idl similarity index 98% rename from include/dxgitype.idl rename to include/vkd3d_dxgitype.idl index aad3f4b..74806c0 100644 --- a/include/dxgitype.idl +++ b/include/vkd3d_dxgitype.idl @@ -18,7 +18,7 @@ */ import "vkd3d_windows.h"; -import "dxgibase.idl"; +import "vkd3d_dxgibase.idl"; typedef enum DXGI_COLOR_SPACE_TYPE { diff --git a/include/unknown.idl b/include/vkd3d_unknown.idl similarity index 100% rename from include/unknown.idl rename to include/vkd3d_unknown.idl diff --git a/tests/d3d12.c b/tests/d3d12.c index 1d8e625..963ecff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -41,7 +41,7 @@ typedef int HRESULT; #include "vkd3d_test.h" #include "vkd3d_windows.h" #define WIDL_C_INLINE_WRAPPERS -#include "d3d12.h" +#include "vkd3d_d3d12.h" #include <inttypes.h> #include <limits.h> @@ -49,7 +49,7 @@ typedef int HRESULT; #include <time.h> #ifdef _WIN32 -# include "dxgi1_4.h" +# include "vkd3d_dxgi1_4.h" #else # include <pthread.h> # include "vkd3d_utils.h"

1 0

Alexandre Julliard : git-to-cvs: Remove obsolete script.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: c45dbf6b8b974ff50991000df7d8095080c5cb36 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c45dbf6b8b974ff50991000d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:09:43 2017 +0100 git-to-cvs: Remove obsolete script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- git-to-cvs | 406 ------------------------------------------------------------- 1 file changed, 406 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c45dbf6b8b974ff50991…

1 0

Francois Gouget : testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: 48be4beddec5c708f08fe584cd8afced5d68fa49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=48be4beddec5c708f08fe584… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:55:46 2017 +0100 testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration. It's the safe option as it ensure the revert will not interfere with the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b0492a3..8388a0e 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -67,7 +67,7 @@ $BinDir = "$::RootDir/bin"; # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 1; +$MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef;

1 0

Francois Gouget : testbot/web: Document that the Redirect() calls don' t return.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: tools Branch: master Commit: b8631bb6ed62409c4b1074bc0b929f1ab5cd7d8a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8631bb6ed62409c4b1074bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:54:59 2017 +0100 testbot/web: Document that the Redirect() calls don't return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9d1525d..a07f02b 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -171,7 +171,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); + $self->Redirect($Target); # does not return } 1;

1 0