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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetMatrixArray() helper.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 96e2d0e018ba469599d50527f187c53f93b76216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e2d0e018ba469599d50527… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:32 2019 +0100 d3dx9: Merge the d3dx_effect_SetMatrixArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 343260b..c5cedbb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3483,10 +3445,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Józef Kucia : vkd3d: Fix feature queries for depth/ stencil formats.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: vkd3d Branch: master Commit: b0c8561cffe6bd8cb6bf1913235da4a05a1d3678 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0c8561cffe6bd8cb6bf191… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 12:19:19 2019 +0100 vkd3d: Fix feature queries for depth/stencil formats. 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/device.c | 4 ++++ tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3d9d90c..204489c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1801,6 +1801,8 @@ static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device goto done; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; @@ -1934,6 +1936,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->Support1 = D3D12_FORMAT_SUPPORT1_NONE; data->Support2 = D3D12_FORMAT_SUPPORT2_NONE; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; diff --git a/tests/d3d12.c b/tests/d3d12.c index 173c576..e044a53 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -343,6 +343,22 @@ static unsigned int format_block_height(DXGI_FORMAT format) } } +static const DXGI_FORMAT depth_stencil_formats[] = +{ + DXGI_FORMAT_R32G8X24_TYPELESS, + DXGI_FORMAT_D32_FLOAT_S8X24_UINT, + DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, + DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, + DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_R24G8_TYPELESS, + DXGI_FORMAT_D24_UNORM_S8_UINT, + DXGI_FORMAT_R24_UNORM_X8_TYPELESS, + DXGI_FORMAT_X24_TYPELESS_G8_UINT, + DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_D16_UNORM, +}; + static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format, struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { @@ -1172,6 +1188,15 @@ static void test_format_support(void) format_support.Support2 & unsupported_format_features[i].f.Support2); } + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -1292,6 +1317,17 @@ static void test_multisample_quality_levels(void) ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Józef Kucia : tests: Introduce assert_that().
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: vkd3d Branch: master Commit: 6c141d7457703e9eb41dc8b8ff6215f5f81f1881 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c141d7457703e9eb41dc8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 12:19:20 2019 +0100 tests: Introduce assert_that(). This allows us to put a bug_if() or todo_if() in the front of functions that check other conditions not directly related to the actual test. assert_that() is similar to ok(). The main difference is that it ignores bug_if() and todo_if(). 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_test.h | 53 ++++++++++++++++++++++++++++++++++++-------- tests/d3d12.c | 14 +++--------- tests/d3d12_crosstest.h | 6 ++--- tests/d3d12_test_utils.h | 12 +++++----- 4 files changed, 56 insertions(+), 29 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index d7593e2..53afdd9 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -40,10 +40,26 @@ static void vkd3d_test_end_todo(void); static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) +/* + * Use assert_that() for conditions that should always be true. + * todo_if() and bug_if() do not influence assert_that(). + */ +#define assert_that assert_that_(__LINE__) + #define ok ok_(__LINE__) + #define skip skip_(__LINE__) + #define trace trace_(__LINE__) +#define assert_that_(line) \ + do { \ + unsigned int vkd3d_line = line; \ + VKD3D_TEST_ASSERT_THAT + +#define VKD3D_TEST_ASSERT_THAT(args...) \ + vkd3d_test_assert_that(vkd3d_line, args); } while (0) + #define ok_(line) \ do { \ unsigned int vkd3d_line = line; \ @@ -117,6 +133,33 @@ broken(bool condition) } static void +vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) +{ + if (result) + { + InterlockedIncrement(&vkd3d_test_state.success_count); + if (vkd3d_test_state.debug_level > 1) + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); + } + else + { + InterlockedIncrement(&vkd3d_test_state.failure_count); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); + vprintf(fmt, args); + } +} + +static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED +vkd3d_test_assert_that(unsigned int line, bool result, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_test_check_assert_that(line, result, fmt, args); + va_end(args); +} + +static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); @@ -147,17 +190,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg } vprintf(fmt, args); } - else if (result) - { - InterlockedIncrement(&vkd3d_test_state.success_count); - if (vkd3d_test_state.debug_level > 1) - printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); - } else { - InterlockedIncrement(&vkd3d_test_state.failure_count); - printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); - vprintf(fmt, args); + vkd3d_test_check_assert_that(line, result, fmt, args); } } diff --git a/tests/d3d12.c b/tests/d3d12.c index e044a53..e3e86e8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5606,7 +5606,6 @@ static void test_draw_uav_only(void) D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_ROOT_PARAMETER root_parameter; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -5688,10 +5687,8 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); bug_if(is_radv_device(context.device)) - check_readback_data_uint(&rb, NULL, 500, 0); - release_resource_readback(&rb); + check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); ID3D12DescriptorHeap_Release(descriptor_heap); @@ -7906,7 +7903,7 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; - bool skip_on_mesa; + bool is_mesa_bug; } tests[] = { @@ -8671,12 +8668,6 @@ static void test_shader_instructions(void) continue; } - if (tests[i].skip_on_mesa && is_mesa_device(context.device)) - { - skip("Skipping shader '%s' test on Mesa.\n", tests[i].ps->name); - continue; - } - if (current_ps != tests[i].ps) { if (context.pipeline_state) @@ -8704,6 +8695,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(tests[i].is_mesa_bug && is_mesa_device(context.device)) check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output.f, 2); reset_command_list(command_list, context.allocator); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ae49bf4..74b8301 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -220,12 +220,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); hr = wait_for_fence(fence, 1); - ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); ID3D12Fence_Release(fence); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 1b2aec5..53fa0e7 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -121,7 +121,7 @@ static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); - ok_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + assert_that_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); return buffer; } @@ -291,10 +291,10 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); - ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, + assert_that(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not texture.\n", texture); miplevel = sub_resource % resource_desc.MipLevels; @@ -317,7 +317,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RESOLVE_DEST, NULL, &IID_ID3D12Resource, (void **)&src_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ID3D12GraphicsCommandList_ResolveSubresource(command_list, src_resource, 0, texture, sub_resource, resource_desc.Format); @@ -348,7 +348,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); @@ -360,7 +360,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb,

1 0

Julian Rüger : German translation for release 4.3
by Jeremy Newman 11 Mar '19

11 Mar '19

Module: website Branch: master Commit: 755a36c3d14252f70c8c0b6732a060b498e8f124 URL: https://source.winehq.org/git/website.git/?a=commit;h=755a36c3d14252f70c8c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 11 14:05:59 2019 +0100 German translation for release 4.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2019030101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019030101.xml b/news/de/2019030101.xml new file mode 100644 index 0000000..4a1b577 --- /dev/null +++ b/news/de/2019030101.xml @@ -0,0 +1,16 @@ +<news> +<date>1. März 2019</date> +<title>Wine 4.3 freigegeben</title> +<body> + Die Entwicklungsversion 4.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Reimplementierung von XAudio2 auf Basis der FAudio-Bibliothek.</li> + <li>Mono-Engine auf die aktuelle Upstream-Version aktualisiert.</li> + <li>Modernerer Umgang mit ikonifizierten Fenstern.</li> + <li>Verbesserte Behandlung von Kernelobjekten.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.0.5
by Jeremy Newman 11 Mar '19

11 Mar '19

Module: website Branch: master Commit: b9b9a75f8b093c32048f135a5087ce9b5aabee2c URL: https://source.winehq.org/git/website.git/?a=commit;h=b9b9a75f8b093c32048f1… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 11 14:06:23 2019 +0100 German translation for release 3.0.5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2019030301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2019030301.xml b/news/de/2019030301.xml new file mode 100644 index 0000000..e83d86b --- /dev/null +++ b/news/de/2019030301.xml @@ -0,0 +1,12 @@ +<news> +<date>3. März 2019</date> +<title>Wine 3.0.5 freigegeben</title> +<body> + Die Wartungsversion 3.0.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.2
by Jeremy Newman 11 Mar '19

11 Mar '19

Module: website Branch: master Commit: 4505956feab915567a023ccf89d6ee22cc071923 URL: https://source.winehq.org/git/website.git/?a=commit;h=4505956feab915567a023… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 11 14:02:18 2019 +0100 German translation for release 4.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2019021501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019021501.xml b/news/de/2019021501.xml new file mode 100644 index 0000000..438e1fa --- /dev/null +++ b/news/de/2019021501.xml @@ -0,0 +1,16 @@ +<news> +<date>15. Februar 2019</date> +<title>Wine 4.2 freigegeben</title> +<body> + Die Entwicklungsversion 4.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Unicode-Stringnormalisierung.</li> + <li>Unterstützung von kryptografischen ECC-Schlüsseln.</li> + <li>Unterstützung für das Mischen von 32- und 64-Bit DLLs im Ladepfad.</li> + <li>Futex-basierte Implementierungen zusätzlicher Synchronisierungs-Primitive.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.1
by Jeremy Newman 11 Mar '19

11 Mar '19

Module: website Branch: master Commit: 9ecd16f18efb2731445ff843761db75c376a232e URL: https://source.winehq.org/git/website.git/?a=commit;h=9ecd16f18efb2731445ff… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 11 13:58:31 2019 +0100 German translation for release 4.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2019020401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2019020401.xml b/news/de/2019020401.xml new file mode 100644 index 0000000..bb8a816 --- /dev/null +++ b/news/de/2019020401.xml @@ -0,0 +1,17 @@ +<news> +<date>4. Februar 2019</date> +<title>Wine 4.1 freigegeben</title> +<body> + Die Entwicklungsversion 4.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von NT-Kernel-Spinlocks.</li> + <li>Bessere Positionierung von Glyphen in DirectWrite.</li> + <li>Genauere Rückmeldung von CPU-Informationen.</li> + <li>Context-Handle-Korrekturen im IDL-Compiler.</li> + <li>Korrekturen am Preloader unter macOS.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Michael Stefaniuc : winemenubuilder: Remove useless cast to self.
by Alexandre Julliard 08 Mar '19

08 Mar '19

Module: wine Branch: master Commit: 6d82b2f1ad0e8d1d7a3b7060ee4993560b499989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d82b2f1ad0e8d1d7a3b7060… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:55 2019 +0100 winemenubuilder: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3fa2b47..fa700f8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -539,7 +539,7 @@ static int populate_module16_icons(struct IconData16 *iconData16, GRPICONDIR *gr for (j = 0; j < iconData16->iconResources->count; j++) { NE_NAMEINFO *iconInfo = (NE_NAMEINFO*)iconPtr; - if ((((BYTE*)iconPtr) + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) + if ((iconPtr + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) { WINE_WARN("file too small for icon NE_NAMEINFO\n"); break;

1 0

Jacek Caban : mshtml: Move TranslateUrl call to before_async_open.
by Alexandre Julliard 08 Mar '19

08 Mar '19

Module: wine Branch: master Commit: 24603b011a893d27ca6969e98f5eccfa3f2248e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24603b011a893d27ca6969e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:53 2019 +0100 mshtml: Move TranslateUrl call to before_async_open. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0384717..9bb1892 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -252,6 +252,20 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO if(FAILED(hres)) return NS_ERROR_FAILURE; + if(doc->hostui) { + OLECHAR *new_url; + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, display_uri, &new_url); + if(hres == S_OK && new_url) { + if(strcmpW(display_uri, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(display_uri), debugstr_w(new_url)); + CoTaskMemFree(new_url); + *cancel = TRUE; + return NS_OK; + } + CoTaskMemFree(new_url); + } + } + if(!exec_shldocvw_67(doc, display_uri)) { SysFreeString(display_uri); *cancel = FALSE; @@ -3859,33 +3873,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = { static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; -static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) -{ - OLECHAR *new_url = NULL; - WCHAR *url; - BOOL ret = FALSE; - HRESULT hres; - - if(!doc->hostui || !ensure_uri(uri)) - return FALSE; - - hres = IUri_GetDisplayUri(uri->uri, &url); - if(FAILED(hres)) - return FALSE; - - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - if(hres == S_OK && new_url) { - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - CoTaskMemFree(new_url); - } - - SysFreeString(url); - return ret; -} - nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval) { nsWineURI *wine_uri; @@ -3899,13 +3886,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret return NS_ERROR_NOT_IMPLEMENTED; } - if(!wine_uri->is_doc_uri) { - wine_uri->is_doc_uri = TRUE; - - if(nscontainer->doc) - *_retval = translate_url(nscontainer->doc, wine_uri); - } - + wine_uri->is_doc_uri = TRUE; nsIFileURL_Release(&wine_uri->nsIFileURL_iface); return NS_OK; }

1 0

Jacek Caban : mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.
by Alexandre Julliard 08 Mar '19

08 Mar '19

Module: wine Branch: master Commit: 9c8162dba22442fdf1e12ceace88a955f43c37e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c8162dba22442fdf1e12cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:49:19 2019 +0100 mshtml: Get rid of no longer needed is_doc_uri from nsWineURI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 - dlls/mshtml/nsembed.c | 7 +------ dlls/mshtml/nsio.c | 31 +------------------------------ 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index b7b6556..accf468 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -136,7 +136,6 @@ typedef struct { HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; -nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT create_doc_uri(IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsIInputStream*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5f6c046..aa081ee 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1612,7 +1612,6 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener NSContainer *This = impl_from_nsIURIContentListener(iface); nsACString spec_str; const char *spec; - nsresult nsres; nsACString_Init(&spec_str, NULL); nsIURI_GetSpec(aURI, &spec_str); @@ -1622,11 +1621,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsACString_Finish(&spec_str); - nsres = on_start_uri_open(This, aURI, _retval); - if(NS_FAILED(nsres)) - return nsres; - - return !*_retval && This->content_listener + return This->content_listener ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) : NS_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9bb1892..436f9bf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -61,7 +61,6 @@ struct nsWineURI { IUri *uri; IUriBuilder *uri_builder; char *origin_charset; - BOOL is_doc_uri; BOOL is_mutable; DWORD scheme; }; @@ -3376,17 +3375,7 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) { - nsWineURI *uri; - nsresult nsres; - - nsres = create_nsuri(iuri, NULL, &uri); - if(NS_FAILED(nsres)) - return E_FAIL; - - uri->is_doc_uri = TRUE; - - *ret = uri; - return S_OK; + return create_nsuri(iuri, NULL, ret); } static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) @@ -3873,24 +3862,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = { static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; -nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval) -{ - nsWineURI *wine_uri; - nsresult nsres; - - *_retval = FALSE; - - nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - WARN("Could not get nsWineURI: %08x\n", nsres); - return NS_ERROR_NOT_IMPLEMENTED; - } - - wine_uri->is_doc_uri = TRUE; - nsIFileURL_Release(&wine_uri->nsIFileURL_iface); - return NS_OK; -} - void init_nsio(nsIComponentManager *component_manager) { nsIFactory *old_factory = NULL;

1 0