wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Nikolay Sivov : winegstreamer: Add stub Video Processor MFT.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 787ed808587bdae39b734a5673dbc8a0247b78ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=787ed808587bdae39b734a56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 5 16:23:21 2019 +0300 winegstreamer: Add stub Video Processor MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 30 ++- dlls/winegstreamer/Makefile.in | 7 +- dlls/winegstreamer/gst_private.h | 3 + dlls/winegstreamer/main.c | 14 +- dlls/winegstreamer/mfplat.c | 444 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/mfplat.idl | 26 +++ 6 files changed, 516 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=787ed808587bdae39b73…

1 0

Alexandre Julliard : mscoree: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: f89ab56ef69097d00ff75eb3991dde8c0e8b54ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f89ab56ef69097d00ff75eb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 12:55:54 2019 +0200 mscoree: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 2 + dlls/mscoree/assembly.c | 1 - dlls/mscoree/config.c | 12 ++-- dlls/mscoree/corruntimehost.c | 25 ++++----- dlls/mscoree/metadata.c | 1 - dlls/mscoree/metahost.c | 124 +++++++++++++++++++++++------------------- dlls/mscoree/mscoree_main.c | 14 ++--- 7 files changed, 93 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f89ab56ef69097d00ff7…

1 0

Alexandre Julliard : appwiz.cpl: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: ed435371893605b2423e46d513480aec877b05df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed435371893605b2423e46d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 11:12:36 2019 +0200 appwiz.cpl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/Makefile.in | 2 + dlls/appwiz.cpl/addons.c | 210 ++++++++++++++++++++------------------------ dlls/appwiz.cpl/appwiz.c | 14 ++- dlls/appwiz.cpl/appwiz.h | 4 +- 4 files changed, 106 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed435371893605b2423e…

1 0

Alexandre Julliard : setupapi: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 72d6759f3a86c24e2db0b6190f4d2fae642e487f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d6759f3a86c24e2db0b619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 4 15:41:03 2019 +0200 setupapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 + dlls/setupapi/devinst.c | 148 ++++++++++++----------- dlls/setupapi/dialog.c | 10 +- dlls/setupapi/dirid.c | 25 ++-- dlls/setupapi/diskspace.c | 2 +- dlls/setupapi/fakedll.c | 279 ++++++++++++++++++++------------------------ dlls/setupapi/install.c | 99 ++++++++-------- dlls/setupapi/misc.c | 37 +++--- dlls/setupapi/parser.c | 66 +++++------ dlls/setupapi/query.c | 12 +- dlls/setupapi/queue.c | 97 ++++++++------- dlls/setupapi/setupcab.c | 11 +- dlls/setupapi/stringtable.c | 19 ++- 13 files changed, 386 insertions(+), 421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72d6759f3a86c24e2db0…

1 0

Alexandre Julliard : wineboot: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 4a8483044ea346e09b4f2769fd1f869a6e4533f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a8483044ea346e09b4f2769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 4 15:40:46 2019 +0200 wineboot: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 + programs/wineboot/shutdown.c | 2 +- programs/wineboot/wineboot.c | 183 ++++++++++++++++++++++++------------------ 3 files changed, 107 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a8483044ea346e09b4f…

1 0

Alexandre Julliard : wineps.drv: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 6887af4f2bf8a863889f7110e9be78bbfc4fa3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6887af4f2bf8a863889f7110… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 09:24:14 2019 +0200 wineps.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/Makefile.in | 2 ++ dlls/wineps.drv/afm.c | 2 -- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/driver.c | 8 ++--- dlls/wineps.drv/escape.c | 6 ---- dlls/wineps.drv/graphics.c | 13 ++----- dlls/wineps.drv/init.c | 12 +++---- dlls/wineps.drv/ppd.c | 3 -- dlls/wineps.drv/ps.c | 1 + dlls/wineps.drv/psdrv.h | 3 +- dlls/wineps.drv/type1.c | 3 -- dlls/wineps.drv/type1afm.c | 85 +++++++++++++++++++++------------------------ dlls/wineps.drv/type42.c | 3 -- 13 files changed, 54 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6887af4f2bf8a863889f…

1 0

Alexandre Julliard : kernel32: Set environment variables for the various Wine paths.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: d5400af7825581b7cf174f65d951b527154e2987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5400af7825581b7cf174f65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 4 15:40:11 2019 +0200 kernel32: Set environment variables for the various Wine paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3e33fa7..7c40c34 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -676,6 +676,23 @@ static WCHAR *get_reg_value( HKEY hkey, const WCHAR *name ) return ret; } +/* set an environment variable for one of the wine path variables */ +static void set_wine_path_variable( const WCHAR *name, const char *unix_path ) +{ + UNICODE_STRING nt_name, var_name; + ANSI_STRING unix_name; + + RtlInitUnicodeString( &var_name, name ); + if (unix_path) + { + RtlInitAnsiString( &unix_name, unix_path ); + if (wine_unix_to_nt_file_name( &unix_name, &nt_name )) return; + RtlSetEnvironmentVariable( NULL, &var_name, &nt_name ); + RtlFreeUnicodeString( &nt_name ); + } + else RtlSetEnvironmentVariable( NULL, &var_name, NULL ); +} + /*********************************************************************** * set_additional_environment @@ -697,12 +714,31 @@ static void set_additional_environment(void) static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; + static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; + static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR wineconfigdirW[] = {'W','I','N','E','C','O','N','F','I','G','D','I','R',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; + const char *path; WCHAR *profile_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; - WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; + WCHAR buf[32]; HANDLE hkey; - DWORD len; + DWORD len, i; + + /* wine paths */ + set_wine_path_variable( winedatadirW, wine_get_data_dir() ); + set_wine_path_variable( winehomedirW, getenv("HOME") ); + set_wine_path_variable( winebuilddirW, wine_get_build_dir() ); + set_wine_path_variable( wineconfigdirW, wine_get_config_dir() ); + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + { + sprintfW( buf, winedlldirW, i ); + set_wine_path_variable( buf, path ); + } + sprintfW( buf, winedlldirW, i ); + set_wine_path_variable( buf, NULL ); /* ComputerName */ len = ARRAY_SIZE( buf );

1 0

Józef Kucia : vkd3d: Add support for VK_EXT_texel_buffer_alignment.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: 46ff2c276476698198ca319abe2f56f4bb1db529 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=46ff2c276476698198ca319… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:10 2019 +0200 vkd3d: Add support for VK_EXT_texel_buffer_alignment. 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> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 42 ++++++++++++++++++++++++++++++++++++++---- libs/vkd3d/resource.c | 37 +++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 3 +++ 5 files changed, 74 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=46ff2c276476698198c…

1 0

Józef Kucia : vkd3d-common: Move vkd3d_write_mask_is_contiguous() from vkd3d-shader.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: eb340126b615b764254cc230a95575c563976221 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb340126b615b764254cc23… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:09 2019 +0200 vkd3d-common: Move vkd3d_write_mask_is_contiguous() from vkd3d-shader. 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/private/vkd3d_common.h | 17 ++++++++++ libs/vkd3d-shader/spirv.c | 18 +---------- tests/vkd3d_common.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index c696f88..1ac8a63 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -23,6 +23,8 @@ #include "vkd3d_windows.h" #include <ctype.h> +#include <limits.h> +#include <stdbool.h> #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) @@ -58,6 +60,21 @@ static inline unsigned int vkd3d_popcount(unsigned int v) #endif } +static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) +{ + unsigned int i, j; + + for (i = 0, j = 0; i < sizeof(mask) * CHAR_BIT; ++i) + { + if (mask & (1u << i)) + ++j; + else if (j) + break; + } + + return vkd3d_popcount(mask) == j; +} + /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ee40953..f17c7fa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3807,22 +3807,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } -static bool vkd3d_write_mask_is_contiguous(unsigned int mask) -{ - unsigned int i, j; - - assert(mask); - for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) - { - if (mask & (1u << i)) - ++j; - else if (j) - break; - } - - return vkd3d_write_mask_component_count(mask) == j; -} - static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, unsigned int *component_count, unsigned int *out_write_mask) @@ -3854,7 +3838,7 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa if (builtin || have_sysval) return true; - if (!vkd3d_write_mask_is_contiguous(write_mask)) + if (!vkd3d_bitmask_is_contiguous(write_mask)) { FIXME("Write mask %#x is non-contiguous.\n", write_mask); return true; diff --git a/tests/vkd3d_common.c b/tests/vkd3d_common.c index 379c8b0..85f1716 100644 --- a/tests/vkd3d_common.c +++ b/tests/vkd3d_common.c @@ -43,7 +43,78 @@ static void test_parse_version(void) check_version("2.3.0", 2, 3); } +static void check_contiguous(uint32_t mask, bool expected_result) +{ + bool r = vkd3d_bitmask_is_contiguous(mask); + ok(r == expected_result, "Got %#x for bitmask %#"PRIx32".\n", r, mask); +} + +static void test_bitmask_is_contiguous(void) +{ + check_contiguous(0x00000000, true); + + check_contiguous(0x00000001, true); + check_contiguous(0x00000002, true); + check_contiguous(0x00000003, true); + check_contiguous(0x00000004, true); + check_contiguous(0x00000005, false); + check_contiguous(0x00000006, true); + check_contiguous(0x00000007, true); + check_contiguous(0x00000008, true); + check_contiguous(0x00000009, false); + check_contiguous(0x0000000a, false); + check_contiguous(0x0000000b, false); + check_contiguous(0x0000000c, true); + check_contiguous(0x0000000d, false); + check_contiguous(0x0000000e, true); + check_contiguous(0x0000000f, true); + + check_contiguous(0x10000000, true); + check_contiguous(0x20000000, true); + check_contiguous(0x30000000, true); + check_contiguous(0x40000000, true); + check_contiguous(0x50000000, false); + check_contiguous(0x60000000, true); + check_contiguous(0x70000000, true); + check_contiguous(0x80000000, true); + check_contiguous(0x90000000, false); + check_contiguous(0xa0000000, false); + check_contiguous(0xb0000000, false); + check_contiguous(0xc0000000, true); + check_contiguous(0xd0000000, false); + check_contiguous(0xe0000000, true); + check_contiguous(0xf0000000, true); + + check_contiguous(0xf000000f, false); + check_contiguous(0x0f0000f0, false); + check_contiguous(0x00f00f00, false); + + check_contiguous(0x000000ff, true); + check_contiguous(0x00000ff0, true); + check_contiguous(0x0000ff00, true); + check_contiguous(0x000ff000, true); + check_contiguous(0x00ff0000, true); + check_contiguous(0xff000000, true); + + check_contiguous(0xfff00000, true); + check_contiguous(0xffff0000, true); + check_contiguous(0xffff0000, true); + check_contiguous(0xfffff000, true); + check_contiguous(0xffffff00, true); + check_contiguous(0xfffffff0, true); + check_contiguous(0xffffffff, true); + + check_contiguous(0x0000001c, true); + check_contiguous(0x000001c0, true); + check_contiguous(0x00001c00, true); + check_contiguous(0x0001c000, true); + check_contiguous(0x001c0000, true); + check_contiguous(0x01c00000, true); + check_contiguous(0x1c000000, true); +} + START_TEST(vkd3d_common) { run_test(test_parse_version); + run_test(test_bitmask_is_contiguous); }

1 0

Józef Kucia : vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for upload buffers.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: 8589935420b4934046911cb1928f0ee89d89912c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8589935420b4934046911cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:08 2019 +0200 vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for upload buffers. 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/resource.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f0864ab..9d56330 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -723,16 +723,13 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT) - { - if (device->vk_info.EXT_conditional_rendering) - buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; - if (device->vk_info.EXT_transform_feedback) - { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; - } + if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; } if (heap_type == D3D12_HEAP_TYPE_UPLOAD)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019