- wine-devel - winehq.org

[PATCH vkd3d 4/7] vkd3d-shader: Implement default control point phase.
by Józef Kucia 11 Feb '19

11 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 88 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc84b405addc..849ebfb1ebfc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1999,6 +1999,8 @@ struct vkd3d_dxbc_compiler uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; + unsigned int input_control_point_count; + unsigned int output_control_point_count; unsigned int shader_phase_count; struct vkd3d_shader_phase *shader_phases; @@ -4740,7 +4742,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_stream(struct vkd3d_dxbc_compiler *comp FIXME("Multiple streams are not supported yet.\n"); } -static void vkd3d_dxbc_compiler_emit_dcl_vertices_out(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_output_vertex_count(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_execution_mode1(compiler, @@ -4965,6 +4967,77 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph return NULL; } +static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *signature = compiler->input_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, input_ptr_type_id, output_ptr_type_id; + uint32_t input_id, output_id, dst_id, src_id; + const struct vkd3d_spirv_builtin *builtin; + enum vkd3d_component_type component_type; + unsigned int component_count; + uint32_t invocation_id; + unsigned int i; + + builtin = get_spirv_builtin_for_register(VKD3DSPR_OUTPOINTID); + invocation_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); + + type_id = vkd3d_spirv_get_type_id(builder, builtin->component_type, builtin->component_count); + invocation_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + if ((builtin = get_spirv_builtin_for_sysval(compiler, e->sysval_semantic))) + { + component_type = builtin->component_type; + component_count = builtin->component_count; + } + else + { + component_type = e->component_type; + component_count = vkd3d_write_mask_component_count(e->mask & 0xff); + } + + if (builtin) + { + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassInput, compiler->input_control_point_count); + } + else + { + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassInput, component_type, component_count, compiler->input_control_point_count); + vkd3d_spirv_add_iface_variable(builder, input_id); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, e->register_index); + } + vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", e->register_index); + + if (builtin) + { + output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, compiler->output_control_point_count); + } + else + { + output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, e->register_index); + } + vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", e->register_index); + + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + output_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + input_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + + dst_id = vkd3d_spirv_build_op_access_chain1(builder, output_ptr_type_id, output_id, invocation_id); + src_id = vkd3d_spirv_build_op_access_chain1(builder, input_ptr_type_id, input_id, invocation_id); + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } +} + static void vkd3d_dxbc_compiler_emit_barrier(struct vkd3d_dxbc_compiler *compiler, SpvScope execution_scope, SpvScope memory_scope, SpvMemorySemanticsMask semantics) { @@ -5006,6 +5079,8 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler if ((control_point_phase = vkd3d_dxbc_compiler_get_control_point_phase(compiler))) vkd3d_spirv_build_op_function_call(builder, void_id, control_point_phase->function_id, NULL, 0); + else + vkd3d_dxbc_compiler_emit_default_control_point_phase(compiler); if (scan_info->use_vocp) vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); @@ -7291,8 +7366,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; case VKD3DSIH_DCL_VERTICES_OUT: - case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: - vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction); + vkd3d_dxbc_compiler_emit_output_vertex_count(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_PRIMITIVE: vkd3d_dxbc_compiler_emit_dcl_input_primitive(compiler, instruction); @@ -7303,6 +7377,13 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_GS_INSTANCES: vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: + compiler->input_control_point_count = instruction->declaration.count; + break; + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: + compiler->output_control_point_count = instruction->declaration.count; + vkd3d_dxbc_compiler_emit_output_vertex_count(compiler, instruction); + break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; @@ -7524,7 +7605,6 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_HS_DECLS: - case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: /* nothing to do */ break; -- 2.19.2

2 1

[PATCH 1/3] wined3d: Return 1e10f for MaxVertexW from wined3d_get_device_caps().
by Paul Gofman 11 Feb '19

11 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23863 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48eae05283..f18e132739 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2179,7 +2179,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxTextureRepeat = 32768; caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; - caps->MaxVertexW = 1.0f; + caps->MaxVertexW = 1e10f; caps->GuardBandLeft = 0.0f; caps->GuardBandTop = 0.0f; -- 2.20.1

3 7

[PATCH 3/3] ntdll/tests: Add a test to show that CommandLine buffer should be inside of the ProcessParameters block.
by Dmitry Timoshkov 11 Feb '19

11 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/env.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 0c864fb2bc..43eac25fb4 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -330,8 +330,17 @@ static void test_process_params(void) WCHAR *str; UINT_PTR pos; MEMORY_BASIC_INFORMATION info; - NTSTATUS status = pRtlCreateProcessParameters( &params, &image, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL ); + NTSTATUS status; + + ok( (char *)cur_params->CommandLine.Buffer > (char *)cur_params && + (char *)cur_params->CommandLine.Buffer < (char *)cur_params + cur_params->Size, + "params %p-%p, params->CommandLine.Buffer %p\n", + cur_params, (char *)cur_params + cur_params->Size, cur_params->CommandLine.Buffer); + size = ((char *)cur_params + cur_params->Size) - (char *)cur_params->CommandLine.Buffer; + ok(size > 180, "CommandLine size is too small (%lu bytes)\n", size); + + status = pRtlCreateProcessParameters( &params, &image, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL ); ok( !status, "failed %x\n", status ); if (VirtualQuery( params, &info, sizeof(info) ) && info.AllocationBase == params) { @@ -398,6 +407,15 @@ static void test_process_params(void) broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ + + str = get_params_string( params, &params->CommandLine ); + ok( (char *)str > (char *)params && + (char *)str < (char *)params + params->Size, + "params %p-%p, params->CommandLine.Buffer %p\n", + cur_params, (char *)cur_params + params->Size, str); + size = ((char *)cur_params + params->Size) - (char *)str; + ok(size > 180, "CommandLine size is too small (%lu bytes)\n", size); + pRtlDestroyProcessParameters( params ); status = pRtlCreateProcessParameters( &params, &image, &dummy, &dummy, &dummy, dummy_env, -- 2.20.1

2 1

[PATCH v2 2/2] httpapi: Add stub for HttpCloseServerSession.
by Yussur-Mustafa Oraji 11 Feb '19

11 Feb '19

Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> --- This Patch allows RiftCat, a VR application, to progress further during load. It used to fuss about not finding the Function inside the dll. dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index cdab28d9f8..6d4247c1e4 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,6 +7,7 @@ @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCloseServerSession(long) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 1b35cd656f..6e596b2cf5 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -192,3 +192,12 @@ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSI FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); return ERROR_ACCESS_DENIED; } + +/*********************************************************************** + * HttpCloseServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) +{ + FIXME( "(%d): stub!\n", id); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/http.h b/include/http.h index b8ce811e01..8f284a88aa 100644 --- a/include/http.h +++ b/include/http.h @@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -- 2.20.1

1 0

[PATCH v2 1/2] httpapi/tests: Add todo's.
by Yussur-Mustafa Oraji 11 Feb '19

11 Feb '19

Required for stubbing HttpCloseServerSession Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> --- The tests only ran if both HttpCloseServerSession and HttpCreateServerSession existed, and, when stubbing HttpCloseServerSession, this is the case, adding a lot of test failures. I did not mark the last one of test_HttpCreateServerSession, as that one works as expected and returns ERROR_INVALID_PARAMETER. dlls/httpapi/tests/httpapi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 47df2260c1..e1437552a8 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -92,30 +92,37 @@ static void test_HttpCreateServerSession(void) version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, NULL, 0); +todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 1; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 3; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 2; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(0xdead); -- 2.20.1

1 0

[PATCH] webservices/tests: Add a missing closesocket call (Coverity).
by Sven Baars 11 Feb '19

11 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/webservices/tests/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index f5297796b3..3fe92367e9 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -708,6 +708,7 @@ static DWORD CALLBACK server_proc( void *arg ) closesocket( c ); if (quit) break; } + closesocket( s ); return 0; } -- 2.17.1

2 1

[PATCH] wineboot: Fix PROCESSOR_ARCHITECTURE reg value
by Brendan McGrath 11 Feb '19

11 Feb '19

On my Windows machine, PROCESSOR_ARCHITECTURE has the value "AMD64", but under wine (since 4.1) the value is "Intel64". It appears some games implement the Detection Logic defined here: https://blogs.msdn.microsoft.com/david.wang/2006/03/27/howto-detect-process… That is, they expect PROCESSOR_ARCHITECTURE to be AMD64 for 64-bit machines. This patch ensures the PROCESSOR_ARCHITECTURE and PROCESSOR_IDENTIFIER are the same in wine as they are in Windows. For example, on my machine this is: "PROCESSOR_ARCHITECTURE"="AMD64" "PROCESSOR_IDENTIFIER"="Intel64 Family 6 Model 42 Stepping 7, GenuineIntel" Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- programs/wineboot/wineboot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32e4225491..b85a3b6b6e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -422,7 +422,7 @@ static void create_environment_registry_keys( void ) HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60], vendorid[13]; - const WCHAR *arch; + const WCHAR *arch, *parch; if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; @@ -435,12 +435,13 @@ static void create_environment_registry_keys( void ) switch (sci.Architecture) { case PROCESSOR_ARCHITECTURE_AMD64: - arch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; + arch = amd64W; + parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; break; case PROCESSOR_ARCHITECTURE_INTEL: default: - arch = x86W; + arch = parch = x86W; break; } set_reg_value( env_key, ProcArchW, arch ); @@ -455,7 +456,7 @@ static void create_environment_registry_keys( void ) case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_INTEL: default: - get_identifier( buffer, arch ); + get_identifier( buffer, parch ); strcatW( buffer, commaW ); strcatW( buffer, vendorid ); break; -- 2.17.1

2 1

[PATCH 1/5] user32/listbox: Check for out of bounds using the index when painting the item
by Gabriel Ivăncescu 11 Feb '19

11 Feb '19

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- user32 versions of the comctl32 patchset. dlls/user32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 594c956..821da60 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -533,7 +533,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

3 13

[PATCH v2] gdi32/dibdrv: Clip segment points to dib rect in wide_line_segment().
by Sergio Gómez Del Real 11 Feb '19

11 Feb '19

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/gdi32/dibdrv/objects.c | 43 ++++++++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 8 +++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f95475a662..26710dd1aa 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,15 +1334,21 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P { HRGN join; POINT pts[4]; + RECT rect; switch (pdev->pen_join) { default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - OffsetRgn( round_cap, pt->x, pt->y ); - CombineRgn( region, region, round_cap, RGN_OR ); - OffsetRgn( round_cap, -pt->x, -pt->y ); + GetRgnBox( round_cap, &rect ); + offset_rect( &rect, pt->x, pt->y ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + { + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + } return; case PS_JOIN_MITER: @@ -1358,7 +1364,9 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P break; } - CombineRgn( region, region, join, RGN_OR ); + GetRgnBox( join, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + CombineRgn( region, region, join, RGN_OR ); DeleteObject( join ); return; } @@ -1367,7 +1375,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { - RECT rect; + RECT rect, clip_rect; BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); @@ -1381,7 +1389,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dx > 0) { face_1->start.x = face_1->end.x = rect.left; @@ -1405,7 +1415,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dy > 0) { face_1->start.x = face_2->end.x = rect.left; @@ -1475,9 +1487,20 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, seg_pts[3].y += wide_half.x; } - segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + if (dx > 0 && dy > 0) + set_rect( &clip_rect, seg_pts[0].x, seg_pts[1].y, seg_pts[2].x, seg_pts[3].y ); + else if (dx > 0 && dy < 0) + set_rect( &clip_rect, seg_pts[1].x, seg_pts[2].y, seg_pts[3].x, seg_pts[0].y ); + else if (dx < 0 && dy > 0) + set_rect( &clip_rect, seg_pts[3].x, seg_pts[0].y, seg_pts[1].x, seg_pts[2].y ); + else + set_rect( &clip_rect, seg_pts[2].x, seg_pts[3].y, seg_pts[0].x, seg_pts[1].y ); + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + { + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + } face_1->start = seg_pts[0]; face_1->end = seg_pts[1]; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 920cd1e7bf..01473dd7e2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -521,6 +521,14 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void set_rect( RECT *rect, int left, int top, int right, int bottom ) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static inline void order_rect( RECT *rect ) { if (rect->left > rect->right) -- 2.17.1

2 1

[PATCH 2/3] kernel32: Store command line inside the process parameters block.
by Dmitry Timoshkov 11 Feb '19

11 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 50 ++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 26c576e4f0..14615a568e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -934,14 +934,11 @@ static void update_library_argv0( const WCHAR *argv0 ) * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' */ -static BOOL build_command_line( WCHAR **argv ) +static WCHAR *build_command_line( WCHAR **argv ) { int len; - WCHAR **arg; + WCHAR **arg, *cmd_line; LPWSTR p; - RTL_USER_PROCESS_PARAMETERS* rupp = NtCurrentTeb()->Peb->ProcessParameters; - - if (rupp->CommandLine.Buffer) return TRUE; /* already got it from the server */ len = 0; for (arg = argv; *arg; arg++) @@ -975,12 +972,10 @@ static BOOL build_command_line( WCHAR **argv ) len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } - if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) - return FALSE; + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return NULL; - p = rupp->CommandLine.Buffer; - rupp->CommandLine.Length = (len - 1) * sizeof(WCHAR); - rupp->CommandLine.MaximumLength = len * sizeof(WCHAR); + p = cmd_line; for (arg = argv; *arg; arg++) { BOOL has_space,has_quote; @@ -1043,11 +1038,11 @@ static BOOL build_command_line( WCHAR **argv ) } *p++=' '; } - if (p > rupp->CommandLine.Buffer) + if (p > cmd_line) p--; /* remove last space */ *p = '\0'; - return TRUE; + return cmd_line; } @@ -1395,6 +1390,8 @@ void CDECL __wine_kernel_init(void) else { BOOL is_64bit; + WCHAR *cmd_line; + RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; if (!SearchPathW( NULL, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH, &is_64bit )) @@ -1403,7 +1400,34 @@ void CDECL __wine_kernel_init(void) ExitProcess( GetLastError() ); } update_library_argv0( main_exe_name ); - if (!build_command_line( __wine_main_wargv )) goto error; + if (!params->CommandLine.Buffer) /* haven't already got it from the server */ + { + SIZE_T size; + char *ptr; + + if (!(cmd_line = build_command_line( __wine_main_wargv ))) goto error; + + size = sizeof(*params); + size += params->CurrentDirectory.DosPath.MaximumLength; + /* some apps try to append custom parameters to the command line, so we need more space */ + size += max(lstrlenW(cmd_line) + 1, MAX_PATH) * sizeof(WCHAR); + /* everything else is empty at this point */ + + if (!(params = HeapReAlloc( GetProcessHeap(), 0, params, size ))) goto error; + + params->AllocationSize = size; + params->Size = size; + + ptr = (char *)(params + 1); + ptr += params->CurrentDirectory.DosPath.MaximumLength; + strcpyW( (WCHAR *)ptr, cmd_line ); + RtlInitUnicodeString( &params->CommandLine, (WCHAR *)ptr ); + + NtCurrentTeb()->Peb->ProcessParameters = params; + + HeapFree( GetProcessHeap(), 0, cmd_line ); + } + start_wineboot( boot_events ); } -- 2.20.1

1 0

[PATCH 1/3] ntdll: Allocate default process parameters from the heap.
by Dmitry Timoshkov 11 Feb '19

11 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/thread.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c4e02dacb1..7ee6b92a15 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,7 +67,6 @@ struct startup_info static PEB *peb; static PEB_LDR_DATA ldr; -static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ static WCHAR current_dir[MAX_PATH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; @@ -307,7 +306,6 @@ void thread_init(void) peb = addr; peb->FastPebLock = &peb_lock; - peb->ProcessParameters = &params; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; @@ -316,9 +314,6 @@ void thread_init(void) peb->OSMinorVersion = 1; peb->OSBuildNumber = 0xA28; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - params.CurrentDirectory.DosPath.Buffer = current_dir; - params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); - params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); @@ -379,14 +374,25 @@ void thread_init(void) } else { + RTL_USER_PROCESS_PARAMETERS *params = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params) ); + + params->AllocationSize = sizeof(*params); + params->Size = sizeof(*params); + params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; + params->CurrentDirectory.DosPath.Buffer = current_dir; + params->CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); + params->wShowWindow = 1; /* SW_SHOWNORMAL */ + if (isatty(0) || isatty(1) || isatty(2)) - params.ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ + params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ if (!isatty(0)) - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); + wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params->hStdInput ); if (!isatty(1)) - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); + wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdOutput ); if (!isatty(2)) - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); + + peb->ProcessParameters = params; } /* initialize time values in user_shared_data */ -- 2.20.1

1 0

[PATCH] httpapi: Add stub for HttpCloseServerSession
by Yussur Oraji 11 Feb '19

11 Feb '19

Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index cdab28d9f8..5690327cb5 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,6 +7,7 @@ @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCloseServerSession(ptr) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 1b35cd656f..c49df92660 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -192,3 +192,12 @@ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSI FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); return ERROR_ACCESS_DENIED; } + +/*********************************************************************** + * HttpCloseServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID *id ) +{ + FIXME( "(%p): stub!\n", id); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/http.h b/include/http.h index b8ce811e01..60f79014a4 100644 --- a/include/http.h +++ b/include/http.h @@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCloseServerSession(PHTTP_SERVER_SESSION_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -- 2.20.1

3 2

[PATCH 1/4] wined3d: Get rid of apply_lights() helper.
by Zebediah Figura 11 Feb '19

11 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9e3eb23cc9..a6a6a284b3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -990,24 +990,6 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capture done.\n"); } -static void apply_lights(struct wined3d_device *device, const struct wined3d_state *state) -{ - UINT i; - - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - - LIST_FOR_EACH(e, &state->light_map[i]) - { - const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); - - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); - } - } -} - void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; @@ -1047,7 +1029,16 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } - apply_lights(device, &stateblock->state); + for (i = 0; i < ARRAY_SIZE(stateblock->state.light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &stateblock->state.light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } if (stateblock->changed.pixelShader) { -- 2.20.1

1 3

[PATCH] oleaut32: Register non-dual dispinterfaces using the correct proxy.
by Zebediah Figura 11 Feb '19

11 Feb '19

Fixes a bug where NetLinx Studio 4 would fail to compile files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 22 +++++++++++++++++++++- dlls/oleaut32/typelib.c | 20 +++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 90f0cb256e..857100e884 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4963,6 +4963,7 @@ static void test_register_typelib(BOOL system_registration) HKEY hkey; REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); BOOL is_wow64 = FALSE; + LONG size; struct { TYPEKIND kind; @@ -5071,7 +5072,26 @@ static void test_register_typelib(BOOL system_registration) ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (ret == ERROR_SUCCESS) + { + size = sizeof(uuid); + ret = RegQueryValueA(hkey, "ProxyStubClsid32", uuid, &size); + ok(!ret, "Failed to get proxy GUID, error %u.\n", ret); + + if (attrs[i].kind == TKIND_INTERFACE || (attrs[i].flags & TYPEFLAG_FDUAL)) + { + ok(!strcasecmp(uuid, "{00020424-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + else + { + ok(!strcasecmp(uuid, "{00020420-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + + RegCloseKey(hkey); + } + /* 32-bit typelibs should be registered into both registry bit modes */ if (is_win64 || is_wow64) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f17a9267b7..acd4d07c89 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -578,14 +578,24 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t WCHAR keyName[60]; HKEY key, subKey; - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR typelib_proxy_clsid[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR dispatch_proxy_clsid[] = {'{','0','0','0','2','0','4','2','0','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; get_interface_key( &tattr->guid, keyName ); if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) { + const WCHAR *proxy_clsid; + + if (tattr->typekind == TKIND_INTERFACE || (tattr->wTypeFlags & TYPEFLAG_FDUAL)) + proxy_clsid = typelib_proxy_clsid; + else + proxy_clsid = dispatch_proxy_clsid; + if (name) RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); @@ -593,14 +603,14 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); } if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); } -- 2.20.1

1 1

[PATCH] windowscodecs/tests: Add IWICBitmapEncoderInfo test
by Alistair Leslie-Hughes 11 Feb '19

11 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/tests/converter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1cfa29b..d3142b3 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1217,6 +1217,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (hglobal && SUCCEEDED(hr)) { + IWICBitmapEncoderInfo *info = NULL; + if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); @@ -1233,6 +1235,20 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = S_OK; } + hr = IWICBitmapEncoder_GetEncoderInfo(encoder, &info); + ok(hr == S_OK || hr == WINCODEC_ERR_COMPONENTNOTFOUND, "wrong error %#x\n", hr); + if (SUCCEEDED(hr)) + { + CLSID clsid; + + hr = IWICBitmapEncoderInfo_GetCLSID(info, &clsid); + ok(hr == S_OK, "wrong error %#x\n", hr); + ok(!IsEqualGUID(&clsid_encoder, &clsid), "wrong CLSID %s (%s)\n", + wine_dbgstr_guid(clsid_encoder), wine_dbgstr_guid(&clsid)); + + IWICBitmapEncoderInfo_Release(info); + } + i=0; while (SUCCEEDED(hr) && srcs[i]) { -- 1.9.1

2 1

[v2 PATCH 6/6] vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 10 ++++++++++ dlls/vssapi/vssapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index a24b320..7ac0adb 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -114,3 +114,13 @@ HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) FIXME("%p\n", backup); return E_NOTIMPL; } + +/****************************************************************** + * ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z + */ +HRESULT WINAPI VSSAPI_CreateVssBackupComponents( IVssBackupComponents **backup ) +{ + FIXME( "%p\n", backup ); + + return CreateVssBackupComponentsInternal(backup); +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 7bd47e8..c759c11 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -9,7 +9,7 @@ @ cdecl -arch=win64 ??1CVssWriter@@UEAA@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ -@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ -- 1.9.1

1 0

[PATCH 6/6] vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 10 ++++++++++ dlls/vssapi/vssapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index a24b320..7617c0d 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -114,3 +114,13 @@ HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) FIXME("%p\n", backup); return E_NOTIMPL; } + +/****************************************************************** + * ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z + */ +HRESULT VSSAPI_CreateVssBackupComponents( IVssBackupComponents **backup ) +{ + FIXME( "%p\n", backup ); + + return CreateVssBackupComponentsInternal(backup); +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 7bd47e8..c759c11 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -9,7 +9,7 @@ @ cdecl -arch=win64 ??1CVssWriter@@UEAA@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ -@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ -- 1.9.1

2 1

[PATCH 5/6] vssapi: Add CreateVssBackupComponentsInternal stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 7 +++++++ dlls/vssapi/vssapi.spec | 2 +- include/vsbackup.idl | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 9234544..a24b320 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "vss.h" #include "vswriter.h" +#include "vsbackup.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); @@ -107,3 +108,9 @@ HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) FIXME( "%p\n", writer ); return S_OK; } + +HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) +{ + FIXME("%p\n", backup); + return E_NOTIMPL; +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 146feb4..7bd47e8 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -75,7 +75,7 @@ @ stub ?Uninitialize@CVssJetWriter@@QAGXXZ @ thiscall -arch=i386 ?Unsubscribe@CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ cdecl -arch=win64 ?Unsubscribe@CVssWriter@@QEAAJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe -@ stub CreateVssBackupComponentsInternal +@ stdcall CreateVssBackupComponentsInternal(ptr) @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal @ stub CreateWriter diff --git a/include/vsbackup.idl b/include/vsbackup.idl index 0b5a2d3..e2f5a54 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -25,6 +25,17 @@ interface IVssEnumObject; interface IVssExamineWriterMetadata; interface IVssWriterComponentsExt; +cpp_quote("#ifdef _cplusplus") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") +cpp_quote("HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup);") +cpp_quote("#ifdef _cplusplus") +cpp_quote("}") +cpp_quote("#endif") + +cpp_quote("static inline HRESULT CreateVssBackupComponents(IVssBackupComponents **backup)") +cpp_quote(" { return CreateVssBackupComponentsInternal(backup); }") + [ uuid("665c1d5f-c218-414d-a05d-7fef5f9d5c86"), local -- 1.9.1

1 0

[PATCH 4/6] include: Add vsbackup.idl
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/vsbackup.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 include/vsbackup.idl diff --git a/include/Makefile.in b/include/Makefile.in index a4642ce..eaf3114 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -646,6 +646,7 @@ SOURCES = \ virtdisk.h \ vmr9.idl \ vmrender.idl \ + vsbackup.idl \ vss.idl \ vsstyle.h \ vssym32.h \ diff --git a/include/vsbackup.idl b/include/vsbackup.idl new file mode 100644 index 0000000..0b5a2d3 --- /dev/null +++ b/include/vsbackup.idl @@ -0,0 +1,97 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ + +import "oaidl.idl"; +import "vswriter.idl"; +import "vss.idl"; + +interface IVssAsync; +interface IVssEnumObject; +interface IVssExamineWriterMetadata; +interface IVssWriterComponentsExt; + +[ + uuid("665c1d5f-c218-414d-a05d-7fef5f9d5c86"), + local +] +interface IVssBackupComponents : IUnknown +{ + HRESULT GetWriterComponentsCount([out] UINT *components); + HRESULT GetWriterComponents([in] UINT index, [out] IVssWriterComponentsExt **writer); + HRESULT InitializeForBackup( [in, optional, defaultvalue(NULL)] BSTR bstrXML); + HRESULT SetBackupState([in] BOOL select_components, [in] BOOL state, + [in] VSS_BACKUP_TYPE type, [in, defaultvalue(FALSE)] BOOL partial_support); + HRESULT InitializeForRestore([in] BSTR xml); + HRESULT SetRestoreState([in] VSS_RESTORE_TYPE restore); + HRESULT GatherWriterMetadata([out] IVssAsync **async); + HRESULT GetWriterMetadataCount([out] UINT *count); + HRESULT GetWriterMetadata([in] UINT index, [out] VSS_ID *instance, [out] IVssExamineWriterMetadata **metadata); + HRESULT FreeWriterMetadata(); + HRESULT AddComponent([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR wszLogicalPath, + [in] LPCWSTR name); + HRESULT PrepareForBackup([out] IVssAsync **async); + HRESULT AbortBackup(); + HRESULT GatherWriterStatus([out] IVssAsync **async); + HRESULT GetWriterStatusCount([out] UINT *count); + HRESULT FreeWriterStatus(); + HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, + [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); + HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] LPCWSTR options); + HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] BOOL selected_restore); + HRESULT SetRestoreOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR options); + HRESULT SetAdditionalRestores([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] BOOL additional); + HRESULT SetPreviousBackupStamp([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR stamp); + HRESULT SaveAsXML([in] BSTR *xml); + HRESULT BackupComplete([out] IVssAsync **async); + HRESULT AddAlternativeLocationMapping([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, + [in] LPCWSTR name, [in] LPCWSTR path, [in] LPCWSTR filespec, [in] BOOL recursive, [in] LPCWSTR destination); + HRESULT AddRestoreSubcomponent([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, [in] LPCWSTR name, + [in] LPCWSTR path, [in] LPCWSTR sub_name, [in] BOOL repair); + HRESULT SetFileRestoreStatus([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] VSS_FILE_RESTORE_STATUS status); + HRESULT AddNewTarget([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] LPCWSTR path, [in] LPCWSTR filename, [in] BOOL recursive, [in] LPCWSTR alternate); + HRESULT SetRangesFilePath([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] UINT partial, [in] LPCWSTR ranges); + HRESULT PreRestore([out] IVssAsync **async); + HRESULT PostRestore([out] IVssAsync **async); + HRESULT SetContext([in] LONG context); + HRESULT StartSnapshotSet([out] VSS_ID *id); + HRESULT AddToSnapshotSet([in] VSS_PWSZ volume,[in] VSS_ID id,[out] VSS_ID *snapshot); + HRESULT DoSnapshotSet([out] IVssAsync ** async); + HRESULT DeleteSnapshots([in] VSS_ID object, [in] VSS_OBJECT_TYPE type, [in] BOOL force, [in] LONG *snapshots, [in] VSS_ID *id); + HRESULT ImportSnapshots([out] IVssAsync **async); + HRESULT BreakSnapshotSet([in] VSS_ID snapshot); + HRESULT GetSnapshotProperties([in] VSS_ID snapshot, [out] VSS_SNAPSHOT_PROP *prop); + HRESULT Query([in] VSS_ID queried, [in] VSS_OBJECT_TYPE queried_type, [in] VSS_OBJECT_TYPE returned_type, [in] IVssEnumObject **enums); + HRESULT IsVolumeSupported([in] VSS_ID provider, [in] VSS_PWSZ volume,[in] BOOL *supported); + HRESULT DisableWriterClasses([in] const VSS_ID *writer_id, [in] UINT class_id); + HRESULT EnableWriterClasses([in] const VSS_ID *classid, [in] UINT id); + HRESULT DisableWriterInstances([in] const VSS_ID *instance, [in] UINT id); + HRESULT ExposeSnapshot([in] VSS_ID snapshot, [in] VSS_PWSZ path, [in] LONG attributes, + [in] VSS_PWSZ expose, [out] VSS_PWSZ *exposed); + HRESULT RevertToSnapshot([in] VSS_ID snapshot, [in] BOOL force); + HRESULT QueryRevertStatus([in] VSS_PWSZ volume, [out] IVssAsync **async); +}; -- 1.9.1

1 0

[PATCH 3/6] include: Convert header vswriter to an idl.
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 2 +- include/vswriter.h | 62 ---------------------------------------------------- include/vswriter.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 63 deletions(-) delete mode 100644 include/vswriter.h create mode 100644 include/vswriter.idl diff --git a/include/Makefile.in b/include/Makefile.in index fd47078..a4642ce 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -649,7 +649,7 @@ SOURCES = \ vss.idl \ vsstyle.h \ vssym32.h \ - vswriter.h \ + vswriter.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ diff --git a/include/vswriter.h b/include/vswriter.h deleted file mode 100644 index ac23861..0000000 --- a/include/vswriter.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2014 Hans Leidekker for CodeWeavers - * - * 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 - */ - -#ifndef __WINE_VSWRITER_H -#define __WINE_VSWRITER_H - -typedef enum -{ - VSS_UT_UNDEFINED, - VSS_UT_BOOTABLESYSTEMSTATE, - VSS_UT_SYSTEMSERVICE, - VSS_UT_USERDATA, - VSS_UT_OTHER -} VSS_USAGE_TYPE; - -typedef enum -{ - VSS_ST_UNDEFINED, - VSS_ST_TRANSACTEDDB, - VSS_ST_NONTRANSACTEDDB, - VSS_ST_OTHER -} VSS_SOURCE_TYPE; - -typedef enum -{ - VSS_AWS_UNDEFINED, - VSS_AWS_NO_ALTERNATE_WRITER, - VSS_AWS_ALTERNATE_WRITER_EXISTS, - VSS_AWS_THIS_IS_ALTERNATE_WRITER -} VSS_ALTERNATE_WRITER_STATE; - -typedef enum VSS_COMPONENT_TYPE -{ - VSS_CT_UNDEFINED = 0, - VSS_CT_DATABASE, - VSS_CT_FILEGROUP -} VSS_COMPONENT_TYPE; - -typedef enum VSS_FILE_RESTORE_STATUS -{ - VSS_RS_UNDEFINED = 0, - VSS_RS_NONE, - VSS_RS_ALL, - VSS_RS_FAILED -} VSS_FILE_RESTORE_STATUS; - -#endif /* ___WINE_VSWRITER_H */ diff --git a/include/vswriter.idl b/include/vswriter.idl new file mode 100644 index 0000000..6bc6890 --- /dev/null +++ b/include/vswriter.idl @@ -0,0 +1,58 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ +import "oaidl.idl"; + +typedef enum +{ + VSS_UT_UNDEFINED, + VSS_UT_BOOTABLESYSTEMSTATE, + VSS_UT_SYSTEMSERVICE, + VSS_UT_USERDATA, + VSS_UT_OTHER +} VSS_USAGE_TYPE; + +typedef enum +{ + VSS_ST_UNDEFINED, + VSS_ST_TRANSACTEDDB, + VSS_ST_NONTRANSACTEDDB, + VSS_ST_OTHER +} VSS_SOURCE_TYPE; + +typedef enum +{ + VSS_AWS_UNDEFINED, + VSS_AWS_NO_ALTERNATE_WRITER, + VSS_AWS_ALTERNATE_WRITER_EXISTS, + VSS_AWS_THIS_IS_ALTERNATE_WRITER +} VSS_ALTERNATE_WRITER_STATE; + +typedef enum VSS_COMPONENT_TYPE +{ + VSS_CT_UNDEFINED = 0, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED = 0, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS; -- 1.9.1

1 0

[PATCH 2/6] include: Add VSS writer enums
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/vswriter.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/vswriter.h b/include/vswriter.h index 043b871..ac23861 100644 --- a/include/vswriter.h +++ b/include/vswriter.h @@ -44,4 +44,19 @@ typedef enum VSS_AWS_THIS_IS_ALTERNATE_WRITER } VSS_ALTERNATE_WRITER_STATE; +typedef enum VSS_COMPONENT_TYPE +{ + VSS_CT_UNDEFINED = 0, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED = 0, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS; + #endif /* ___WINE_VSWRITER_H */ -- 1.9.1

1 0

[PATCH 1/6] include: Add more VSS_* typedefs
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/vss.idl | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/vss.idl b/include/vss.idl index 62335ea..a190e66 100644 --- a/include/vss.idl +++ b/include/vss.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; typedef GUID VSS_ID; +typedef [unique, string] WCHAR *VSS_PWSZ; +typedef LONGLONG VSS_TIMESTAMP; typedef enum _VSS_APPLICATION_LEVEL { @@ -29,3 +31,91 @@ typedef enum _VSS_APPLICATION_LEVEL VSS_APP_FRONT_END = 3, VSS_APP_SYSTEM_RM = 4 } VSS_APPLICATION_LEVEL; + +typedef enum _VSS_BACKUP_TYPE +{ + VSS_BT_UNDEFINED, + VSS_BT_FULL, + VSS_BT_INCREMENTAL, + VSS_BT_DIFFERENTIAL, + VSS_BT_LOG, + VSS_BT_COPY, + VSS_BT_OTHER +} VSS_BACKUP_TYPE, *PVSS_BACKUP_TYPE; + +typedef enum _VSS_RESTORE_TYPE +{ + VSS_RTYPE_UNDEFINED, + VSS_RTYPE_BY_COPY, + VSS_RTYPE_IMPORT, + VSS_RTYPE_OTHER +} VSS_RESTORE_TYPE, *PVSS_RESTORE_TYPE; + +typedef enum _VSS_WRITER_STATE +{ + VSS_WS_UNKNOWN = 0, + VSS_WS_STABLE, + VSS_WS_WAITING_FOR_FREEZE, + VSS_WS_WAITING_FOR_THAW, + VSS_WS_WAITING_FOR_POST_SNAPSHOT, + VSS_WS_WAITING_FOR_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_IDENTIFY, + VSS_WS_FAILED_AT_PREPARE_BACKUP, + VSS_WS_FAILED_AT_PREPARE_SNAPSHOT, + VSS_WS_FAILED_AT_FREEZE, + VSS_WS_FAILED_AT_THAW, + VSS_WS_FAILED_AT_POST_SNAPSHOT, + VSS_WS_FAILED_AT_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_PRE_RESTORE, + VSS_WS_FAILED_AT_POST_RESTORE, + VSS_WS_FAILED_AT_BACKUPSHUTDOWN, + VSS_WS_COUNT +} VSS_WRITER_STATE, *PVSS_WRITER_STATE; + +typedef enum _VSS_OBJECT_TYPE +{ + VSS_OBJECT_UNKNOWN = 0, + VSS_OBJECT_NONE, + VSS_OBJECT_SNAPSHOT_SET, + VSS_OBJECT_SNAPSHOT, + VSS_OBJECT_PROVIDER, + VSS_OBJECT_TYPE_COUNT +} VSS_OBJECT_TYPE, *PVSS_OBJECT_TYPE; + +typedef enum _VSS_SNAPSHOT_STATE +{ + VSS_SS_UNKNOWN = 0, + VSS_SS_PREPARING, + VSS_SS_PROCESSING_PREPARE, + VSS_SS_PREPARED, + VSS_SS_PROCESSING_PRECOMMIT, + VSS_SS_PRECOMMITTED, + VSS_SS_PROCESSING_COMMIT, + VSS_SS_COMMITTED, + VSS_SS_PROCESSING_POSTCOMMIT, + VSS_SS_PROCESSING_PREFINALCOMMIT, + VSS_SS_PREFINALCOMMITTED, + VSS_SS_PROCESSING_POSTFINALCOMMIT, + VSS_SS_CREATED, + VSS_SS_ABORTED, + VSS_SS_DELETED, + VSS_SS_POSTCOMMITTED, + VSS_SS_COUNT +} VSS_SNAPSHOT_STATE, *PVSS_SNAPSHOT_STATE; + +typedef struct _VSS_SNAPSHOT_PROP +{ + VSS_ID m_SnapshotId; + VSS_ID m_SnapshotSetId; + LONG m_lSnapshotsCount; + VSS_PWSZ m_pwszSnapshotDeviceObject; + VSS_PWSZ m_pwszOriginalVolumeName; + VSS_PWSZ m_pwszOriginatingMachine; + VSS_PWSZ m_pwszServiceMachine; + VSS_PWSZ m_pwszExposedName; + VSS_PWSZ m_pwszExposedPath; + VSS_ID m_ProviderId; + LONG m_lSnapshotAttributes; + VSS_TIMESTAMP m_tsCreationTimestamp; + VSS_SNAPSHOT_STATE m_eStatus; +} VSS_SNAPSHOT_PROP, *PVSS_SNAPSHOT_PROP; -- 1.9.1

1 0

wine-3.0.5-rc1 Available
by Michael Stefaniuc 10 Feb '19

10 Feb '19

Hello guys, I have pushed wine-3.0.5-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ This should hopefully be the final release for 3.0.x. Nothing special in it, just that it has more patches that I would have liked it to have. Now the interesting bits and pieces from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 3.0.5 (total 75): 5402 Multiple MFC-based apps crash during non-modal child dialog control creation with active window being zero (Canon PhotoStitch 3.1.13, Flexible Renamer v8.4) 16845 Radio buttons not being checked on focus 33117 Can't load Bach41.ttf with CreateFontIndirect 33502 SnagIt writes incomplete HKLM\\System\\CurrentControlSet\\Control\\Print\\Printers entry, causing loader failures for apps that depend on winspool.drv 35320 setlocale(Chinese_China.950) returns NULL 35504 LibreOffice 4.2 installer copies MSVC++ runtime files into erroneous 'C:\Win\System\' path (directory targets/properties not re-resolved after updates from custom actions) 38066 Memento Mori (Numen: Contest of Heroes): mouse buttons don't work (needs native dinput8) 38402 glDebugMessageCallback has mismatched calling convention 39051 TabbedTextOut() incorrect output on tab character 39508 Microsoft Office 365/OneDrive for Business installer fails in Win8+ mode with 'advapi:ParseStringSidToSid String constant not supported: "OW"' (failure to decode 'Owner Rights' SID 'S-1-3-4') 40160 cant install mobogenie 40206 Revit Architecture fails to install: throws Messagebox "Function failed" and aborts 40208 Cegid Business Line installer fails in custom script action with "Object doesn't support this property or method: 'ObjRegistry.CreateKey'" (needs 'StdRegProv.CreateKey') 40264 Iris Online cannot connect to login server (SO_SNDBUF with value 0 is not allowed in OSX) 40303 Control Data passed in DIALOGEX Resource passes pointer with offset sizeof(WORD) 40433 Fifa 11 EU demo fails to install when run from custom DVD 40828 Switching resolution in desktop mode makes task bar redraw on top of full screen game 41039 Multiple kernel drivers crash on unimplemented function ntoskrnl.exe.FsRtlIsNameInExpression (VirtualBox, QQProtect for Tencent TIM (com.qq.office) 2.1.x) 41356 Multiple applications and games need support for szOID_NIST_sha* OIDs in crypt32 (The Crew (Uplay), Star Wars The Old Republic, PSNow v9.0.5) 41404 WPS Office 10.1.0.5775 unhandled exception on installation 41419 Visio 2013 crashes with unimplemented function msvcp100.dll.?_GetCombinableSize@details@Concurrency@@YAIXZ 41934 Spreaker Studio 1.4.2 fails to install 42010 ReactOS Calc does not show dots in radio buttons. 42078 Dungeons & Dragons: Chronicles of Mystara needs d3dx11_43.dll.D3DX11CreateShaderResourceViewFromMemory 43187 EA Origin 'OriginWebHelperService' (QGuiApplication) non-interactive service process crashes due to null monitor info when determining the primary (default) screen 43358 EVE Online crashes on startup in Win7+ mode (XAudio 2.7 'IXAudio2SourceVoice::GetState' called with 'Flags' parameter, causing %ESI or %EDI register corruption) 43464 Elite Dangerous Horizons fails to connect to server with CRC error 43550 Photoshop Elements 15 spams console with fixme:file:MoveFileWithProgressW MOVEFILE_WRITE_THROUGH unimplemented 43630 Altium Designer Installer - Richedit control shows rtf code instead of text 43890 Divinity: Original Sin 2 does not successfully launch 44109 Simple free HAM program Opera crashes, needs unimplemented function pdh.dll.PdhVbAddCounter 44177 Guitar Pro 5: Long freezes during draw process of dashed lines (P.M. or let ring markers) 44229 Visual C++ 1.51 can't add files to project (GetOpenFileName16() doesn't support custom templates or hooks) 44409 png with indexed colors and alpha miss the alpha channel on loading 44485 Delphi 7 debugger generates new exceptions by itself 45320 cmd creates an environment variable with an empty name 45347 Google Chrome installer crashes on unimplemented function propsys.dll.InitPropVariantFromCLSID 45523 FIFA 18 Demo needs KERNEL32.dll.SetProcessWorkingSetSizeEx 45538 Multiple applications crash on unimplemented function msvcr120.dll.?wait@Concurrency@@YAXI@Z (Amazon Workspaces client, EnginePrime, Bethesda Launcher Updater) 45569 League of Legends 8.12+ needs NtQueryInformationProcess(ProcessCookie) stub 45588 .Net Framework 4.5.2 (WPF) System.Windows.Media.PixelFormat requires windowscodecs.dll.IWICPixelFormatInfo_{GetChannelCount,GetChannelMask,GetBitsPerPixel}_Proxy 45593 Wargaming.net Game Center: Installer deadlocks during download ('ntdll.RtlDeregisterWaitEx' must not synchronously wait when 'CompletionEvent' is NULL) 45673 Calling delegated proxy methods returns 0x800706b5 (RPC_S_UNKNOWN_IF), "err:rpc:RpcAssoc_BindConnection syntax {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}, 0.0 not supported" 45709 djkaty.com Simple2D demos v1.13 need support for IWICImagingFactory2, CLSID '{317d06e8-5f24-433d-bdf7-79ce68d8abc2}' 45724 Multiple EndScene calls result in multiple glFlush (FF XIV) 45782 mono needs unimplemented function api-ms-win-crt-math-l1-1-0.dll._Cbuild 45816 Orbit Profile crashes in Unhandled exception: unimplemented function msvcp140.dll.?_Winerror_message@std@@YAKKPADK@Z called 45831 Slack installer (Squirrel) fails:Unhandled Exception: System.AccessViolationException:at MS.Win32.PresentationCore.UnsafeNativeMethods.WICMetadataQueryReader.ContainsMetadataByName 45832 Windower 5 beta (FF XI tool) crash: Unhandled Exception: System.NotImplementedException at Windower.UI.Views.RootView.OnSourceInitialized (DwmExtendFrameIntoClientArea should return S_OK) 45880 Multiple PC/SC applications crash on unimplemented function winscard.dll.SCardCancel (Aruba key, SmartCard test apps) 45910 nProtect GameGuard used by multiple MMORPG games crashes on unimplemented function wevtapi.dll.EvtExportLog (4Story, Phantasy Star Online 2) 45913 tchar.h: using the macro _sntprintf leads to an undefined reference to snwprintf; macro should resolve to _snwprintf 45915 x64dbg/x32dbg crash during shutdown on unimplemented function msvcr120.dll.??0_Scoped_lock@_NonReentrantPPLLock@details@Concurrency@@QAE@AAV123@@Z 45928 Microsoft Windows SDK for Windows 10 (.NET 4.6) installer fails, claims KB3118401 is needed ('ucrtbase.dll' missing version resource, >= 10.0.0) 45942 AnyRail6: crashing when open Options 45997 iPed 7G 2019 (.NET 4.0 app) v13.0.10800 crashes with System.NotImplementedException at system.drawing.pen.ScaleTransform 46040 Intel Extreme Tuning Utility v6.4 kernel driver 'iocbios2.sys' crashes on unimplemented function ntoskrnl.exe.KeSetTargetProcessorDpc 46057 Multiple applications want 'ntdll.NtQueryInformationToken' to support 'TokenVirtualizationEnabled' (24) info class (Blizzard Battle.net) 46080 Multiple installers are missing title bar buttons 46081 Multiple installers show readonly drives with broken size 46084 Skype 8.33.0.50 installer crashes due to unimplemented msvcp140.dll.?_Winerror_map@std@@YAHH@Z 46089 TopoEdit tool from Windows 10 SDK (10.0.17763.x) crashes in ntdll.LdrResolveDelayLoadedAPI during resolver failure (NULL dll failure hook) 46129 'sqlwriter.exe' from Microsoft SQL Server 2012/2014 crashes on unimplemented function VSSAPI.DLL.??0CVssWriter@@QEAA@XZ 46135 Microsoft ODBC tool 'odbcconf.exe' (part of MDAC 2.x install) crashes during configuration (some 'advapi32.dll' API entries are not hotpatchable due to PIC/GOT code at entry) 46156 Multiple applications from Windows 7-10 crash on unimplemented function slc.dll.SLOpen 46157 Doxie 2.10.3 crashes on unimplemented function msvcr120.dll._vscprintf_l 46168 dotnet35sp1 installer has an error under wow64 46172 Multiple applications from Windows 7-10 crash on unimplemented function slc.dll.SLGetLicensingStatusInformation 46186 LoadImageA searches images in the wrong directory 46210 explorer /desktop leaks atoms from DDE interface 46215 File Open Dialog fails to set focus to Filename text box 46229 server/ptrace: NetBSD debug register storage 46328 Installer for Tanglet 1.5.3 crashes at target directory selection 46430 Doom3 (CD version) fails to install 46435 F1 2011 crashes with a messed up rendering in DX9 mode ---------------------------------------------------------------- Changes since 3.0.4: Akihiro Sagawa (6): dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests. dinput/tests: Add more tests for keyboard subtypes. dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used. windowscodecs: Fix buffer overflow when generating a palette. gdiplus/tests: Add more PNG color format tests. gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded. (rebased). Alex Henrie (1): advapi32: Fix memory leak in QueryServiceConfig2W (Coverity). Alexandre Julliard (8): user32: Use height from font metrics for empty text runs in TabbedTextOut(). oleaut32: Fix argument order with instance and VARIANT return type. server: Reset hardware breakpoint sizes before setting them. commdlg: Implement custom template support in 16-bit file dialogs. commdlg: Add support for 16-bit file dialog hooks. ntdll: Also store FPU registers in RtlRaiseException(). msi: Return an error code instead of a button id in msi_change_media(). winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Alistair Leslie-Hughes (6): include: Add more types to ntifs.h. ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken. include: Add MmIsAddressValid to header. ws2_32: Ignore a SO_SNDBUF value of 0 on macOS. advapi32: Add DECL_HOTPATCH to registry functions. user32: Don't reset focus if current dialog is a child. Andrew Wesie (2): wined3d: Remove extraneous flush from EndScene. ntdll: Stub for ProcessCookie in NtQueryInformationProcess. Andrey Gusev (4): pdh: Add PdhVbAddCounter stub. slc: Add SLOpen stub. slc: Add SLGetLicensingStatusInformation stub. d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. André Hentschel (2): kernel32: Add stub for SetProcessWorkingSetSizeEx. ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing. Austin English (1): winscard: Add SCardCancel stub. Bernhard Übelacker (1): user32: Let nulldrv return some dummy monitor information. Brendan McGrath (4): advapi32: Don't create a WoW6432 MachineGuid. dinput/tests: Test that the GUID is the same for Instance and Product. dinput: Use the same GUID for Instance and Product. msi: Set stale function pointers to NULL. Daniel Lehman (1): gdi32: Fix memory leak (Valgrind). Dmitry Timoshkov (13): windowscodecs: IWICMetadataQueryReader::GetMetadataByName() should accept NULL for returned value. kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile. user32/tests: Add a test for custom dialog control data. wrc: Fix generation of custom dialog control data. user32: Fix the pointer to custom dialog control data. user32: Don't force a combobox repaint on WM_SIZE. user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG. user32: If there is no dialog controls to set focus to then set focus to dialog itself. gdi32: Improve detection of symbol charset for old truetype fonts. user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. user32/tests: Add a test for navigating a group of buttons using keyboard events. user32: Add support for navigating a group of radio buttons using a keyboard. Fabian Maurer (5): propsys: Add PropVariantToStringWithDefault and tests. msi: In dialogs show titlebar buttons. riched20: Properly handle \0 inside rtf input. user32: LoadImage should not only search in the working directory. winealsa.drv: Don't crash when getting NULL event from midi. Frédéric Fauberteau (1): wineserver: Support debug registers on NetBSD. Gijs Vermeulen (2): msvcr100: Add Concurrency::wait stub. msvcp100: Add Concurrency::_GetCombinableSize stub. Hans Leidekker (4): wbemprox: Implement StdRegProv.CreateKey. msi: Allow recursive changes to the target folder path. msi: Support substorage transforms in MsiDatabaseApplyTransform. msi: Only perform the media check if the label of the disk entry differs from the last. Huw D. M. Davies (1): winspool: Skip the old printer check if it has a NULL port name. Jacek Caban (2): crypt32: Added support for szOID_NIST_sha* OIDs. include: Don't use unnamed struct for NDR_SCONTEXT declaration. Jactry Zeng (1): ntoskrnl: Add FsRtlIsNameInExpression stub. Jason Edmeades (1): msvcrt: Do not put cmd.exe special environment variables into the environ. Louis Lenders (6): dwmapi: Return S_OK in DwmExtendFrameIntoClientArea. ucrtbase: Add version resource. wevtapi: Add stub for EvtExportLog. wevtapi: Fix typo in spec file. ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc. vssapi: Add a few win64 spec entries. Michael Müller (2): ntdll: Implement ProcessPriorityClass in NtQueryInformationProcess. ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess. Michael Stefaniuc (2): include: Make ARRAY_SIZE() available in wine/test.h. include: Add a generic available ARRAY_SIZE(). Mihail Ivanchev (1): include: Fixed the Unicode expansion of _sntprintf. Nikolay Sivov (11): propsys: Add InitPropVariantFromCLSID(). advapi32/tests: Test return SIDs for wellknown two-character names. advapi32: Add WinCreatorOwnerRightsSid to wellknown list. advapi32: Add a name for WinBuiltinAnyPackageSid. wincodecs: Add IWICImagingFactory2 stub. wincodecs/icoformat: Improve input data validation on decoder initialization. wincodecs: Add IWICPixelFormatInfo exports. gdiplus: Implement GdipScalePenTransform(). gdiplus: Fix the number of transformed points for squared caps. xmllite/reader: Fix compiler warning. inetcomm: Fix a leak on DeleteProp() (Valgrind). Olivier F. R. Dierick (1): explorer: Don't change Z-order of the taskbar when displaying it. Paul Gofman (1): d3dx9: Return correct comment length from get_instr_length(). Pierre Schweitzer (1): msi: Don't consider read-only drives when enumerating volumes. Piotr Caban (10): msvcr120: Added _Cbuild implementation. msvcp140: Added _Winerror_message implementation. msvcr100: Use scoped_lock internal buffer when locking critical_section. msvcr100: Add _NonReentrantPPLLock class implementation. msvcr100: Add _ReentrantPPLLock class implementation. msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation. msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class. msvcrt: Support "China" country name in setlocale function. msvcp140: Add _Winerror_map implementation. msvcrt: Add _vscprintf_l implementation. Ralf Habacker (1): explorer: Fix atom leaks caused by not releasing DDE interface. Roger Zoellner (1): ntdll: Relax checks for valid affinity mask in NtSetInformationThread(). Sebastian Lackner (2): opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences. xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback. Serge Gautherie (1): jscript: Fix a MSVC-x64 warning about to_uint32(). Stefan Dösinger (5): msvcp140: Implement _Temp_get. msvcp120: Tr2::_Rename_wchar NULL ptr handling differs from tr2::_Rename. msvcp140: Export _Rename. msvcp140/tests: Test _Last_write_time and _Set_last_write_time. ntdll: Avoid more race conditions in RtlDeregisterWaitEx. Sven Baars (2): dsound: Fix a memory leak (Valgrind). gdiplus: Fix a memory leak (Valgrind). Zebediah Figura (2): rpcrt4/tests: Add tests for delegated proxy methods. ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer(). Zhiyi Zhang (1): riched20: Fix a use after free. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] ntdll: Add a direct futex-based implementation of condition variables.
by Zebediah Figura 10 Feb '19

10 Feb '19

While the current path for condition variables will ultimately use futexes if they are available, the path for address waits is vulnerable to several spurious wakes, which can be obviated by using condition variables as futexes directly. This greatly improves performance for Path of Exile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45524 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 84 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 693013f5a3..3293c52859 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -113,6 +113,23 @@ static inline int use_futexes(void) } return supported; } + +static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) +{ + LARGE_INTEGER now; + timeout_t diff; + + if (timeout->QuadPart > 0) + { + NtQuerySystemTime( &now ); + diff = timeout->QuadPart - now.QuadPart; + } + else + diff = -timeout->QuadPart; + + timespec->tv_sec = diff / TICKSPERSEC; + timespec->tv_nsec = (diff % TICKSPERSEC) * 100; +} #endif /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ @@ -1876,6 +1893,47 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) return TRUE; } +#ifdef __linux__ +static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +{ + struct timespec timespec; + int ret; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) + { + timespec_from_timeout( &timespec, timeout ); + ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + } + else + ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) + return STATUS_TIMEOUT; + return STATUS_WAIT_0; +} + +static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) +{ + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + futex_wake( (int *)&variable->Ptr, count ); + return STATUS_SUCCESS; +} +#else +static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) +{ + return STATUS_NOT_IMPLEMENTED; +} +#endif + /*********************************************************************** * RtlInitializeConditionVariable (NTDLL.@) * @@ -1910,7 +1968,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlWakeAddressSingle( variable ); + if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -1921,7 +1980,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlWakeAddressAll( variable ); + if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -1947,7 +2007,8 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R RtlLeaveCriticalSection( crit ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); @@ -1984,7 +2045,8 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, else RtlReleaseSRWLockExclusive( lock ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); @@ -2039,8 +2101,6 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T { int *futex; int val; - LARGE_INTEGER now; - timeout_t diff; struct timespec timespec; int ret; @@ -2060,17 +2120,7 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T if (timeout) { - if (timeout->QuadPart > 0) - { - NtQuerySystemTime( &now ); - diff = timeout->QuadPart - now.QuadPart; - } - else - diff = -timeout->QuadPart; - - timespec.tv_sec = diff / TICKSPERSEC; - timespec.tv_nsec = (diff % TICKSPERSEC) * 100; - + timespec_from_timeout( &timespec, timeout ); ret = futex_wait( futex, val, &timespec ); } else -- 2.20.1

1 0

[PATCH v2] winecfg: Update Windows version array.
by Isira Seneviratne 10 Feb '19

10 Feb '19

2 1

[PATCH] winecfg: Update Windows version array.
by Isira Seneviratne 10 Feb '19

10 Feb '19

1 0

[PATCH v2] view: Move open dialog filter string to resource file and add extensions.
by Isira Seneviratne 10 Feb '19

10 Feb '19

1 0

[PATCH] editorconfig: Indent Makefiles properly.
by Kai Krakow 10 Feb '19

10 Feb '19

Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 5f1c49f76a8..289038d37f0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,3 +9,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true max_line_length = 100 + +[Makefile*] +indent_style = tab +indent_size = 8 -- 2.19.2

1 0

[PATCH v7] po: Update Sinhala translation.
by Isira Seneviratne 10 Feb '19

10 Feb '19

1 0

[PATCH 1/2] comctl32/listview: Take care of scrolling offset when repositioning header.
by Nikolay Sivov 09 Feb '19

09 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1230c55d5c..078bea14af 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11084,13 +11084,21 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - /* if control created invisible header isn't created */ + /* When ListView control is created invisible, header isn't created right away. */ if (infoPtr->hwndHeader) { - HDLAYOUT hl; - WINDOWPOS wp; + POINT origin; + WINDOWPOS wp; + HDLAYOUT hl; + RECT rect; - hl.prc = &infoPtr->rcList; + LISTVIEW_GetOrigin(infoPtr, &origin); + + rect = infoPtr->rcList; + rect.left += origin.x; + rect.top += origin.y; + + hl.prc = &rect; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); -- 2.20.1

1 1

[PATCH] wininet/tests: Fix some memory leaks (Valgrind).
by Sven Baars 09 Feb '19

09 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wininet/tests/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9ec4902cdc..5a0cc11754 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5813,6 +5813,9 @@ static void test_security_flags(void) ok(!cert->lpszEncryptionAlgName, "unexpected encryption algorithm name\n"); ok(!cert->lpszProtocolName, "unexpected protocol name\n"); ok(cert->dwKeySize != 0xdeadbeef, "unexpected key size\n"); + + LocalFree(cert->lpszSubjectInfo); + LocalFree(cert->lpszIssuerInfo); } HeapFree(GetProcessHeap(), 0, cert); -- 2.17.1

1 0

GSoC begins soon
by André Hentschel 09 Feb '19

09 Feb '19

Hi all, we are in the process of hopefully getting accepted again. Can everybody please go through the ideas list and add/update/remove projects? https://wiki.winehq.org/Summer_Of_Code Thanks!

1 0

[PATCH v6] po: Update Sinhala translation.
by Isira Seneviratne 09 Feb '19

09 Feb '19

1 0

[PATCH v5] po: Update Sinhala translation.
by Isira Seneviratne 09 Feb '19

09 Feb '19

2 1

[PATCH v2 1/2] wined3d: Return 1 for stream frequency if the value was not set.
by Paul Gofman 09 Feb '19

09 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - initialize streams' frequencies to 1 instead of handling uninitialized case. dlls/wined3d/context.c | 2 +- dlls/wined3d/stateblock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c7eb7849fc..ae94daba2e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5390,7 +5390,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, stream = &state->streams[element->stream_idx]; if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b694414382..9da99d7302 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1448,6 +1448,9 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, @@ -1496,6 +1499,9 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, -- 2.20.1

4 5

[PATCH v4] po: Update Sinhala translation.
by Isira Seneviratne 09 Feb '19

09 Feb '19

1 0

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 09 Feb '19

09 Feb '19

1 0

[v2 PATCH] d3d10: Forward d3d10_shader_reflection_GetInputParameterDesc() to d3dcompiler implementation.
by Nikolay Sivov 08 Feb '19

08 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 22 --------------- dlls/d3d10/d3d10_private.h | 8 ------ dlls/d3d10/shader.c | 58 ++++++++++++++++++++++++++++++++++---- 3 files changed, 52 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed1244e..813be8fbdc 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -293,25 +293,3 @@ const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device) return "ps_4_0"; } - -HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) -{ - struct d3d10_shader_reflection *object; - - FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 shader reflection object memory\n"); - return E_OUTOFMEMORY; - } - - object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; - object->refcount = 1; - - *reflector = &object->ID3D10ShaderReflection_iface; - - TRACE("Created ID3D10ShaderReflection %p\n", object); - - return S_OK; -} diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b869..f40b9e238c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -253,14 +253,6 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; -/* ID3D10ShaderReflection */ -extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; -struct d3d10_shader_reflection -{ - ID3D10ShaderReflection ID3D10ShaderReflection_iface; - LONG refcount; -}; - HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; /* D3D10Core */ diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index c97d8dfdf0..261d80077e 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -25,6 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +struct d3d10_shader_reflection +{ + ID3D10ShaderReflection ID3D10ShaderReflection_iface; + LONG refcount; + + ID3D11ShaderReflection *reflector; +}; + /* IUnknown methods */ static inline struct d3d10_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) @@ -62,13 +70,16 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflector->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u\n", reflector, refcount); if (!refcount) - heap_free(This); + { + reflector->reflector->lpVtbl->Release(reflector->reflector); + heap_free(reflector); + } return refcount; } @@ -109,9 +120,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc( ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); + D3D11_SIGNATURE_PARAMETER_DESC d3d11_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (SUCCEEDED(hr = reflector->reflector->lpVtbl->GetInputParameterDesc(reflector->reflector, index, &d3d11_desc))) + memcpy(desc, &d3d11_desc, sizeof(*desc)); + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc( @@ -137,6 +154,35 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetOutputParameterDesc, }; +HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) +{ + struct d3d10_shader_reflection *object; + HRESULT hr; + + TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 shader reflection object memory\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = D3DReflect(data, data_size, &IID_ID3D11ShaderReflection, (void **)&object->reflector))) + { + heap_free(object); + return hr; + } + + object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->refcount = 1; + + *reflector = &object->ID3D10ShaderReflection_iface; + + TRACE("Created ID3D10ShaderReflection %p\n", object); + + return S_OK; +} + HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) -- 2.20.1

1 1

[PATCH v2 2/2] mshtml: Support custom user agent strings in IOmNavigator::get_appVersion.
by Jacek Caban 08 Feb '19

08 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 11 ++++++----- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-)

1 0

[PATCH 2/2] mshtml: Support custom user agent strings in IOmNavigator::get_appVersion.
by Jacek Caban 08 Feb '19

08 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 11 ++++++----- dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-)

2 1

[PATCH] ntoskrnl.exe: Add PsReferenceProcessFilePointer stub.
by Jacek Caban 08 Feb '19

08 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+)

1 0

Re: Sinhala NLS file
by Isira Seneviratne 08 Feb '19

08 Feb '19

On Fri, Feb 8, 2019, 4:49 PM Alexandre Julliard <julliard(a)winehq.org> wrote: > Isira Seneviratne <isirasen96(a)gmail.com> writes: > > > Hi, > > > > Shouldn't there be a NLS file for the Sinhala language in > > dlls/kernel32/nls? I checked and couldn't find it. > > We don't have one yet, but yes, it should be added. > Okay, thank you for the information. On a related note, is the lack of a NLS file the reason the Wine applications don't display in Sinhala when I run it using LANG=si_LK.UTF-8? > > -- > Alexandre Julliard > julliard(a)winehq.org >

2 1

[PATCH 2/2] wined3d: Do not convert SO declaration entries.
by Józef Kucia 08 Feb '19

08 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Mainly for vkd3d-shader backend. --- dlls/d3d11/shader.c | 92 ++++------------------------------ dlls/wined3d/glsl_shader.c | 40 ++++++++------- dlls/wined3d/shader.c | 57 ++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 6 +-- 5 files changed, 93 insertions(+), 103 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 455ff9f7c8c8..259ac331dbfe 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT osgn_handler(const char *data, DWORD data_size, DWORD tag, void *context) -{ - struct wined3d_shader_signature *signature = context; - - if (tag != TAG_OSGN && tag != TAG_OSG5) - return S_OK; - - if (signature->elements) - { - FIXME("Multiple input signatures.\n"); - shader_free_signature(signature); - } - return shader_parse_signature(tag, data, data_size, signature); -} - static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) { size_t len, max_len; @@ -1073,18 +1058,14 @@ static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = d3d_geometry_shader_wined3d_object_destroyed, }; -static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_output_element *elements, - const D3D11_SO_DECLARATION_ENTRY *entries, unsigned int entry_count, - const unsigned int *buffer_strides, unsigned int buffer_stride_count, - const struct wined3d_shader_signature *os, D3D_FEATURE_LEVEL feature_level) +static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY *entries, unsigned int entry_count, + const unsigned int *buffer_strides, unsigned int buffer_stride_count, D3D_FEATURE_LEVEL feature_level) { - unsigned int i, j, mask; + unsigned int i, j; for (i = 0; i < entry_count; ++i) { - struct wined3d_stream_output_element *e = &elements[i]; const D3D11_SO_DECLARATION_ENTRY *f = &entries[i]; - struct wined3d_shader_signature_element *output; TRACE("Stream: %u, semantic: %s, semantic idx: %u, start component: %u, " "component count %u, output slot %u.\n", @@ -1112,11 +1093,6 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o return E_INVALIDARG; } - e->stream_idx = f->Stream; - e->component_idx = f->StartComponent; - e->component_count = f->ComponentCount; - e->output_slot = f->OutputSlot; - if (!f->SemanticName) { if (f->SemanticIndex) @@ -1129,10 +1105,8 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } - - e->register_idx = WINED3D_STREAM_OUTPUT_GAP; } - else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex, f->Stream))) + else { if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount || f->StartComponent + f->ComponentCount > 4) @@ -1140,29 +1114,6 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } - - for (j = 0; j < 4; ++j) - { - if ((1u << j) & output->mask) - break; - } - e->component_idx += j; - mask = ((1u << e->component_count) - 1) << e->component_idx; - if ((output->mask & 0xff & mask) != mask) - { - WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n", - e->component_idx, e->component_count, mask, output->mask & 0xff); - return E_INVALIDARG; - } - - e->register_idx = output->register_idx; - TRACE("Register idx: %u, register component idx %u, register mask %#x.\n", - e->register_idx, e->component_idx, mask); - } - else - { - WARN("Failed to find output signature element for stream output entry.\n"); - return E_INVALIDARG; } } @@ -1255,7 +1206,6 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, unsigned int rasterizer_stream) { struct wined3d_stream_output_desc so_desc; - struct wined3d_shader_signature signature; struct wined3d_shader_desc desc; unsigned int i; HRESULT hr; @@ -1292,40 +1242,22 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, } } + if (FAILED(hr = validate_stream_output_entries(so_entries, so_entry_count, + buffer_strides, buffer_stride_count, device->feature_level))) + return hr; + desc.byte_code = byte_code; desc.byte_code_size = byte_code_length; memset(&so_desc, 0, sizeof(so_desc)); if (so_entries) { + so_desc.elements = (const struct wined3d_stream_output_element *)so_entries; so_desc.element_count = so_entry_count; for (i = 0; i < min(buffer_stride_count, ARRAY_SIZE(so_desc.buffer_strides)); ++i) so_desc.buffer_strides[i] = buffer_strides[i]; so_desc.buffer_stride_count = buffer_stride_count; so_desc.rasterizer_stream_idx = rasterizer_stream; - - if (!(so_desc.elements = heap_calloc(so_entry_count, sizeof(*so_desc.elements)))) - { - ERR("Failed to allocate wined3d stream output element array memory.\n"); - return E_OUTOFMEMORY; - } - - memset(&signature, 0, sizeof(signature)); - if (FAILED(hr = parse_dxbc(byte_code, byte_code_length, osgn_handler, &signature))) - { - ERR("Failed to parse input signature.\n"); - heap_free(so_desc.elements); - return E_FAIL; - } - hr = wined3d_so_elements_from_d3d11_so_entries(so_desc.elements, - so_entries, so_entry_count, buffer_strides, buffer_stride_count, - &signature, device->feature_level); - shader_free_signature(&signature); - if (FAILED(hr)) - { - heap_free(so_desc.elements); - return hr; - } } shader->ID3D11GeometryShader_iface.lpVtbl = &d3d11_geometry_shader_vtbl; @@ -1334,10 +1266,8 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - hr = wined3d_shader_create_gs(device->wined3d_device, &desc, so_entries ? &so_desc : NULL, - shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); - heap_free(so_desc.elements); - if (FAILED(hr)) + if (FAILED(hr = wined3d_shader_create_gs(device->wined3d_device, &desc, so_entries ? &so_desc : NULL, + shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader))) { WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db6760ebc303..ba2c62165b53 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -818,9 +818,10 @@ static void append_transform_feedback_skip_components(const char **varyings, } } -static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, - struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, - char *strings, unsigned int *strings_length, GLenum buffer_mode) +static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_string_buffer *buffer, + const char **varyings, unsigned int *varying_count, + char *strings, unsigned int *strings_length, GLenum buffer_mode, + const struct wined3d_stream_output_desc *so_desc, const unsigned int *output_register_idx) { unsigned int i, buffer_idx, count, length, highest_output_slot, stride; BOOL have_varyings_to_record = FALSE; @@ -847,7 +848,7 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3 stride += e->component_count; - if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + if (!e->semantic_name) { append_transform_feedback_skip_components(varyings, &count, &strings, &length, buffer, e->component_count); @@ -865,12 +866,12 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3 } string_buffer_sprintf(buffer, "shader_in_out.reg%u_%u_%u", - e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } else { - string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); + string_buffer_sprintf(buffer, "shader_in_out.reg%u", output_register_idx[i]); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -906,6 +907,7 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3 static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { + const unsigned int *output_register_idx = shader->u.gs.output_register_idx; const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_string_buffer *buffer; @@ -927,7 +929,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co for (i = 0; i < so_desc->element_count; ++i) { - if (so_desc->elements[i].register_idx == WINED3D_STREAM_OUTPUT_GAP) + if (!so_desc->elements[i].semantic_name) { FIXME("ARB_transform_feedback3 is needed for stream output gaps.\n"); return; @@ -960,7 +962,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co buffer = string_buffer_get(&priv->string_buffers); - if (!shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode)) + if (!shader_glsl_generate_transform_feedback_varyings(buffer, NULL, &count, NULL, &length, mode, so_desc, output_register_idx)) { FIXME("No varyings to record, disabling transform feedback.\n"); shader->u.gs.so_desc.element_count = 0; @@ -982,7 +984,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co return; } - shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, varyings, NULL, strings, NULL, mode); + shader_glsl_generate_transform_feedback_varyings(buffer, varyings, NULL, strings, NULL, mode, so_desc, output_register_idx); GL_EXTCALL(glTransformFeedbackVaryings(program_id, count, varyings, mode)); checkGLcall("glTransformFeedbackVaryings"); @@ -7421,7 +7423,8 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl } static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *priv, - const struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) + const struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc, + const unsigned int *output_register_idx) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int i; @@ -7436,7 +7439,7 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr FIXME("Unhandled stream %u.\n", e->stream_idx); continue; } - if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + if (!e->semantic_name) continue; if (e->component_idx || e->component_count != 4) @@ -7446,11 +7449,11 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr else shader_addline(buffer, "vec%u", e->component_count); shader_addline(buffer, " reg%u_%u_%u;\n", - e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1); } else { - shader_addline(buffer, "vec4 reg%u;\n", e->register_idx); + shader_addline(buffer, "vec4 reg%u;\n", output_register_idx[i]); } } shader_addline(buffer, "} shader_out;\n"); @@ -7466,7 +7469,7 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr FIXME("Unhandled stream %u.\n", e->stream_idx); continue; } - if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + if (!e->semantic_name) continue; if (e->component_idx || e->component_count != 4) @@ -7477,13 +7480,13 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr write_mask = ((1u << e->component_count) - 1) << e->component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", - e->register_idx, e->component_idx, e->component_idx + e->component_count - 1, - e->register_idx, str_mask); + output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1, + output_register_idx[i], str_mask); } else { shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", - e->register_idx, e->register_idx); + output_register_idx[i], output_register_idx[i]); } } shader_addline(buffer, "}\n"); @@ -8529,7 +8532,8 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (is_rasterization_disabled(shader)) { - shader_glsl_generate_stream_output_setup(priv, shader, &shader->u.gs.so_desc); + shader_glsl_generate_stream_output_setup(priv, shader, + &shader->u.gs.so_desc, shader->u.gs.output_register_idx); } else { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e11a37cf078f..a52b9a1c83a9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3144,7 +3144,8 @@ static void shader_cleanup(struct wined3d_shader *shader) } else if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) { - heap_free(shader->u.gs.so_desc.elements); + heap_free((void *)shader->u.gs.so_desc.elements); + heap_free(shader->u.gs.output_register_idx); } heap_free(shader->patch_constant_signature.elements); @@ -3728,12 +3729,31 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } +static struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, + unsigned int stream_idx, const char *semantic_name, unsigned int semantic_idx) +{ + struct wined3d_shader_signature_element *e = s->elements; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + if (e[i].stream_idx == stream_idx + && !strcasecmp(e[i].semantic_name, semantic_name) + && e[i].semantic_idx == semantic_idx) + return &e[i]; + } + + return NULL; +} + static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) { const struct wined3d_shader_frontend *fe = shader->frontend; + const struct wined3d_shader_signature_element *output; struct wined3d_stream_output_element *elements; struct wined3d_shader_version shader_version; + unsigned int i, j, mask; const DWORD *ptr; void *fe_data; HRESULT hr; @@ -3772,6 +3792,9 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return hr; } + if (!(shader->u.gs.output_register_idx = heap_calloc(so_desc->element_count, sizeof(*shader->u.gs.output_register_idx)))) + return E_OUTOFMEMORY; + if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) return E_OUTOFMEMORY; @@ -3779,6 +3802,38 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, shader->u.gs.so_desc.elements = elements; memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); + for (i = 0; i < so_desc->element_count; ++i) + { + struct wined3d_stream_output_element *e = &elements[i]; + + if (!e->semantic_name) + continue; + if (!(output = shader_find_signature_element(&shader->output_signature, + e->stream_idx, e->semantic_name, e->semantic_idx))) + { + WARN("Failed to find output signature element for stream output entry.\n"); + return E_INVALIDARG; + } + + e->semantic_name = output->semantic_name; + shader->u.gs.output_register_idx[i] = output->register_idx; + + for (j = 0; j < 4; ++j) + { + if ((1u << j) & output->mask) + break; + } + e->component_idx += j; + + mask = ((1u << e->component_count) - 1) << e->component_idx; + if ((output->mask & 0xff & mask) != mask) + { + WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n", + e->component_idx, e->component_count, mask, output->mask & 0xff); + return E_INVALIDARG; + } + } + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66a2ee4e418e..f44dccbe6c1e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4191,6 +4191,7 @@ struct wined3d_geometry_shader unsigned int instance_count; struct wined3d_stream_output_desc so_desc; + unsigned int *output_register_idx; }; struct wined3d_pixel_shader diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e09e4e1fce2d..a58dd87ee7d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1574,7 +1574,6 @@ enum wined3d_shader_type #define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe #define WINED3D_MAX_STREAM_OUTPUT_BUFFERS 4 -#define WINED3D_STREAM_OUTPUT_GAP 0xffffffff #define WINED3D_NO_RASTERIZER_STREAM 0xffffffff #define WINED3D_VIEW_BUFFER_RAW 0x00000001 @@ -2060,7 +2059,8 @@ struct wined3d_shader_desc struct wined3d_stream_output_element { unsigned int stream_idx; - unsigned int register_idx; + const char *semantic_name; + unsigned int semantic_idx; BYTE component_idx; BYTE component_count; BYTE output_slot; @@ -2068,7 +2068,7 @@ struct wined3d_stream_output_element struct wined3d_stream_output_desc { - struct wined3d_stream_output_element *elements; + const struct wined3d_stream_output_element *elements; unsigned int element_count; unsigned int buffer_strides[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; unsigned int buffer_stride_count; -- 2.19.2

3 2

[PATCH 1/2] d3d11: Avoid using wined3d_stream_output_element for validation.
by Józef Kucia 08 Feb '19

08 Feb '19

Validate D3D11_SO_DECLARATION_ENTRY directly. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/shader.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 3f5c6e147482..455ff9f7c8c8 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1124,9 +1124,9 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); return E_INVALIDARG; } - if (e->component_idx || !e->component_count) + if (f->StartComponent || !f->ComponentCount) { - WARN("Invalid stream output gap %u-%u.\n", e->component_idx, e->component_count); + WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } @@ -1134,10 +1134,10 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o } else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex, f->Stream))) { - if (e->component_idx > 3 || e->component_count > 4 || !e->component_count - || e->component_idx + e->component_count > 4) + if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount + || f->StartComponent + f->ComponentCount > 4) { - WARN("Invalid component range %u-%u.\n", e->component_idx, e->component_count); + WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } @@ -1168,17 +1168,21 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (i = 0; i < entry_count; ++i) { - const struct wined3d_stream_output_element *e1 = &elements[i]; - if (e1->register_idx == WINED3D_STREAM_OUTPUT_GAP) + const D3D11_SO_DECLARATION_ENTRY *e1 = &entries[i]; + if (!e1->SemanticName) /* gap */ continue; for (j = i + 1; j < entry_count; ++j) { - const struct wined3d_stream_output_element *e2 = &elements[j]; + const D3D11_SO_DECLARATION_ENTRY *e2 = &entries[j]; + if (!e2->SemanticName) /* gap */ + continue; - if (e1->register_idx == e2->register_idx - && e1->component_idx < e2->component_idx + e2->component_count - && e1->component_idx + e1->component_count > e2->component_idx) + if (e1->Stream == e2->Stream + && !strcasecmp(e1->SemanticName, e2->SemanticName) + && e1->SemanticIndex == e2->SemanticIndex + && e1->StartComponent < e2->StartComponent + e2->ComponentCount + && e1->StartComponent + e1->ComponentCount > e2->StartComponent) { WARN("Stream output elements %u and %u overlap.\n", i, j); return E_INVALIDARG; @@ -1194,14 +1198,14 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (j = 0; j < entry_count; ++j) { - const struct wined3d_stream_output_element *e = &elements[j]; + const D3D11_SO_DECLARATION_ENTRY *e = &entries[j]; - if (e->stream_idx != i) + if (e->Stream != i) continue; - current_stride[e->output_slot] += 4 * e->component_count; - ++element_count[e->output_slot]; - if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) - ++gap_count[e->output_slot]; + current_stride[e->OutputSlot] += 4 * e->ComponentCount; + ++element_count[e->OutputSlot]; + if (!e->SemanticName) + ++gap_count[e->OutputSlot]; } for (j = 0; j < D3D11_SO_BUFFER_SLOT_COUNT; ++j) -- 2.19.2

3 2

[PATCH 1/2] mstml: Add style.borderSpacing property implementation.
by Jacek Caban 08 Feb '19

08 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 35 +++++++++++++++++++++++------------ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-)

1 0

[PATCH] d3d10: Forward d3d10_shader_reflection_GetInputParameterDesc() to d3dcompiler implementation.
by Nikolay Sivov 08 Feb '19

08 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 22 --------------- dlls/d3d10/d3d10_private.h | 8 ------ dlls/d3d10/shader.c | 55 +++++++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed1244e..813be8fbdc 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -293,25 +293,3 @@ const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device) return "ps_4_0"; } - -HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) -{ - struct d3d10_shader_reflection *object; - - FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 shader reflection object memory\n"); - return E_OUTOFMEMORY; - } - - object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; - object->refcount = 1; - - *reflector = &object->ID3D10ShaderReflection_iface; - - TRACE("Created ID3D10ShaderReflection %p\n", object); - - return S_OK; -} diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b869..f40b9e238c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -253,14 +253,6 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; -/* ID3D10ShaderReflection */ -extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; -struct d3d10_shader_reflection -{ - ID3D10ShaderReflection ID3D10ShaderReflection_iface; - LONG refcount; -}; - HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; /* D3D10Core */ diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index c97d8dfdf0..48aa9f3a35 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -25,6 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +struct d3d10_shader_reflection +{ + ID3D10ShaderReflection ID3D10ShaderReflection_iface; + LONG refcount; + + ID3D11ShaderReflection *reflector; +}; + /* IUnknown methods */ static inline struct d3d10_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) @@ -62,13 +70,16 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflector->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u\n", reflector, refcount); if (!refcount) - heap_free(This); + { + reflector->reflector->lpVtbl->Release(reflector->reflector); + heap_free(reflector); + } return refcount; } @@ -109,9 +120,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc( ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + return reflector->reflector->lpVtbl->GetInputParameterDesc(reflector->reflector, index, + (D3D11_SIGNATURE_PARAMETER_DESC *)desc); } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc( @@ -137,6 +151,35 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetOutputParameterDesc, }; +HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) +{ + struct d3d10_shader_reflection *object; + HRESULT hr; + + TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 shader reflection object memory\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = D3DReflect(data, data_size, &IID_ID3D11ShaderReflection, (void **)&object->reflector))) + { + heap_free(object); + return hr; + } + + object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->refcount = 1; + + *reflector = &object->ID3D10ShaderReflection_iface; + + TRACE("Created ID3D10ShaderReflection %p\n", object); + + return S_OK; +} + HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) -- 2.20.1

2 1

[PATCH 1/2] wined3d: Return 1 for stream frequency if the value was not set.
by Paul Gofman 08 Feb '19

08 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e31ecc32e2..990b29bd73 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1477,7 +1477,7 @@ HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device TRACE("device %p, stream_idx %u, divider %p.\n", device, stream_idx, divider); stream = &device->state.streams[stream_idx]; - *divider = stream->flags | stream->frequency; + *divider = stream->flags | (stream->frequency || stream->flags ? stream->frequency : 1); TRACE("Returning %#x.\n", *divider); -- 2.20.1

2 2

[PATCH vkd3d 4/5] vkd3d-shader: Factor out vkd3d_symbol_set_register_info().
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 98 ++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 59 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9d1dad019b1b..2c7519d6a89f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1824,6 +1824,19 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, symbol->key.reg.idx = reg->idx[0].offset; } +static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, + uint32_t val_id, SpvStorageClass storage_class, + enum vkd3d_component_type component_type, DWORD write_mask) +{ + symbol->id = val_id; + symbol->info.reg.storage_class = storage_class; + symbol->info.reg.member_idx = 0; + symbol->info.reg.component_type = component_type; + symbol->info.reg.write_mask = write_mask; + symbol->info.reg.structure_stride = 0; + symbol->info.reg.is_aggregate = false; +} + static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, const struct vkd3d_shader_register *reg) { @@ -2489,9 +2502,9 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; + register_info->member_idx = 0; register_info->component_type = VKD3D_TYPE_FLOAT; register_info->write_mask = VKD3DSP_WRITEMASK_ALL; - register_info->member_idx = 0; register_info->structure_stride = 0; register_info->is_aggregate = false; return true; @@ -2508,10 +2521,10 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); register_info->id = symbol->id; register_info->storage_class = symbol->info.reg.storage_class; + register_info->member_idx = symbol->info.reg.member_idx; register_info->component_type = symbol->info.reg.component_type; register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; - register_info->member_idx = symbol->info.reg.member_idx; register_info->is_aggregate = symbol->info.reg.is_aggregate; return true; @@ -3486,12 +3499,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if (!entry) { - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = use_private_var - ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, + use_private_var ? VKD3D_TYPE_FLOAT : component_type, + use_private_var ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3558,11 +3568,8 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = input_id; - reg_symbol.info.reg.storage_class = SpvStorageClassInput; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = builtin->component_type; - reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, + builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); @@ -3588,12 +3595,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil } vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = val_id; - reg_symbol.info.reg.storage_class = SpvStorageClassMax; /* Intermediate value */ - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, val_id, + SpvStorageClassMax /* Intermediate value */, + VKD3D_TYPE_UINT, VKD3DSP_WRITEMASK_0); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, val_id, reg); } @@ -3727,11 +3731,8 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = output_id; - reg_symbol.info.reg.storage_class = SpvStorageClassOutput; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = builtin->component_type; - reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, output_id, SpvStorageClassOutput, + builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); @@ -3835,11 +3836,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); if (!entry) { - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, + use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -4044,11 +4042,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil vkd3d_spirv_end_function_stream_insertion(builder); vkd3d_symbol_make_register(&reg_symbol, &reg); - reg_symbol.id = id; - reg_symbol.info.reg.storage_class = SpvStorageClassFunction; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, id, + SpvStorageClassFunction, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4112,12 +4107,9 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com vkd3d_spirv_build_op_member_name(builder, struct_id, j, "cb%u", reg_idx); vkd3d_symbol_make_register(&reg_symbol, &cb->reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); reg_symbol.info.reg.member_idx = j; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); ++j; @@ -4175,12 +4167,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4212,11 +4200,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ memset(&reg, 0, sizeof(reg)); reg.type = VKD3DSPR_IMMCONSTBUFFER; vkd3d_symbol_make_register(&reg_symbol, &reg); - reg_symbol.id = icb_id; - reg_symbol.info.reg.storage_class = SpvStorageClassPrivate; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, icb_id, + SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4243,9 +4228,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4549,13 +4533,9 @@ static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_UINT, VKD3DSP_WRITEMASK_0); reg_symbol.info.reg.structure_stride = structure_stride; - reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -- 2.19.2

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_builtin().
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 66 ++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3db8e3db07dc..9d1dad019b1b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3370,6 +3370,24 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); } +static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t id; + + if (!array_size && builtin->is_spirv_array) + array_size = 1; + + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, + &builder->global_stream, storage_class, + builtin->component_type, builtin->component_count, array_size); + vkd3d_spirv_add_iface_variable(builder, id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + + return id; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3439,15 +3457,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } storage_class = SpvStorageClassInput; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, input_component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, input_id); + if (builtin) { - vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); } else { + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, input_component_count, array_size); + vkd3d_spirv_add_iface_variable(builder, input_id); vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); @@ -3524,7 +3543,6 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; - unsigned int array_size; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -3537,12 +3555,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * return; } - array_size = builtin->is_spirv_array ? 1 : 0; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, - &builder->global_stream, SpvStorageClassInput, - builtin->component_type, builtin->component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = input_id; @@ -3630,7 +3643,6 @@ static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signa static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_signature *output_signature = compiler->output_signature; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t clip_distance_mask = 0, clip_distance_id = 0; uint32_t cull_distance_mask = 0, cull_distance_id = 0; const struct vkd3d_spirv_builtin *builtin; @@ -3659,20 +3671,16 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { count = vkd3d_popcount(clip_distance_mask); builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CLIP_DISTANCE); - clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, clip_distance_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); + clip_distance_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, count); } if (cull_distance_mask) { count = vkd3d_popcount(cull_distance_mask); builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CULL_DISTANCE); - cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, cull_distance_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); + cull_distance_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, count); } for (i = 0; i < output_signature->element_count; ++i) @@ -3704,7 +3712,6 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; - unsigned int array_size; uint32_t output_id; assert(!reg->idx[0].rel_addr); @@ -3717,12 +3724,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler return; } - array_size = builtin->is_spirv_array ? 1 : 0; - output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, - &builder->global_stream, SpvStorageClassOutput, - builtin->component_type, builtin->component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, output_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, output_id, builtin->spirv_builtin); + output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = output_id; @@ -3783,19 +3785,19 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); - vkd3d_spirv_add_iface_variable(builder, id); - if (builtin) { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, 0); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } else { + id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count); + vkd3d_spirv_add_iface_variable(builder, id); + if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) { vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); -- 2.19.2

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Get sysval semantic from shader signature for inputs.
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> In domain shaders, inputs are declared with dcl_input without semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e803237c1f29..679abfee4061 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -424,6 +424,7 @@ enum vkd3d_component_type enum vkd3d_sysval_semantic { + VKD3D_SV_NONE = 0, VKD3D_SV_POSITION = 1, VKD3D_SV_CLIP_DISTANCE = 2, VKD3D_SV_CULL_DISTANCE = 3, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8f9fff7f89ca..3db8e3db07dc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,6 +129,20 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +{ + switch (sysval) + { + case VKD3D_SV_NONE: + return VKD3D_SIV_NONE; + case VKD3D_SV_POSITION: + return VKD3D_SIV_POSITION; + default: + FIXME("Unhandled sysval %#x.\n", sysval); + return VKD3D_SIV_NONE; + } +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3396,6 +3410,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } + if (!sysval && signature_element->sysval_semantic) + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); -- 2.19.2

2 1

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