July 2019 - Wine-commits - list.winehq.org

Paul Gofman : wined3d: Do not modify shader register maps in backends.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 9607a427dedb897c42a775b4b7afc3260292e059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9607a427dedb897c42a775b4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:40 2019 +0300 wined3d: Do not modify shader register maps in backends. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 31 +++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++++++++++--------- dlls/wined3d/shader.c | 40 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 62 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9607a427dedb897c42a7…

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

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 : 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 : 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 : 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 : 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

Józef Kucia : tests: Destroy placed resources after destroying heap.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: c648ea85aa567b7fd45db59ea98d90f890aa2793 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c648ea85aa567b7fd45db59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:06 2019 +0200 tests: Destroy placed resources after destroying heap. In order to exercise that the destroyed heap isn't accessed. 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> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5177607..b8eb4ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6769,11 +6769,11 @@ static void test_map_placed_resources(void) release_resource_readback(&rb); ID3D12Resource_Release(uav_buffer); - for (i = 0; i < ARRAY_SIZE(cb); ++i) - ID3D12Resource_Release(cb[i]); ID3D12Resource_Release(readback_buffer); ID3D12Heap_Release(upload_heap); ID3D12Heap_Release(readback_heap); + for (i = 0; i < ARRAY_SIZE(cb); ++i) + ID3D12Resource_Release(cb[i]); destroy_test_context(&context); }

1 0

Józef Kucia : tests: Add test for Map() on reserved resources.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: acd5417f8bb8570f35ad86ee8a77544d5e43e1b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=acd5417f8bb8570f35ad86e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:07 2019 +0200 tests: Add test for Map() on reserved resources. 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> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8eb4ab..bd055fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2186,6 +2186,7 @@ static void test_create_reserved_resource(void) ID3D12Device *device; ULONG refcount; HRESULT hr; + void *ptr; if (!(device = create_device())) { @@ -2232,6 +2233,10 @@ static void test_create_reserved_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags); + /* Map() is not allowed on reserved resources */ + hr = ID3D12Resource_Map(resource, 0, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);

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