April 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] d3dcompiler: Make printed IR a bit more readable.
by Zebediah Figura 28 Apr '20

28 Apr '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dcompiler_43/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0c8b918d139..d24341329d3 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1904,7 +1904,10 @@ static void debug_dump_instr_list(const struct list *list) static void debug_dump_src(const struct hlsl_ir_node *node) { - wine_dbg_printf("%p", node); + if (node->index) + wine_dbg_printf("@%u", node->index); + else + wine_dbg_printf("%p", node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) @@ -2178,7 +2181,10 @@ static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) static void debug_dump_instr(const struct hlsl_ir_node *instr) { - wine_dbg_printf("%4u: %p: ", instr->index, instr); + if (instr->index) + wine_dbg_printf("%4u: ", instr->index); + else + wine_dbg_printf("%p: ", instr); switch (instr->type) { case HLSL_IR_EXPR: -- 2.26.0

4 14

[PATCH] d3dx9/tests: Remove useless '\n' within some ok() messages.
by Matteo Bruni 28 Apr '20

28 Apr '20

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index ae7c5f2010c..81f902291de 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10126,10 +10126,10 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, test_context->device, &mesh_clone); - ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); - ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); /* Check declaration elements */ for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { @@ -10315,8 +10315,7 @@ static void test_valid_mesh(void) } hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); - todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " - "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); + todo_wine ok(hr == tc[i].exp_hr, "Test %u, got unexpected hr %#x, expected %#x.\n", i, hr, tc[i].exp_hr); /* Note errors_and_warnings is deliberately not checked because that * would require copying wast amounts of the text output. */ @@ -10459,8 +10458,7 @@ static void test_optimize_faces(void) hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); - ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++) @@ -10477,15 +10475,13 @@ static void test_optimize_faces(void) hr = D3DXOptimizeFaces(tc[0].indices, tc[0].num_faces, tc[0].num_vertices, tc[0].indices_are_32bit, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " - "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Number of faces must be smaller than 2^15 */ hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, tc[0].num_vertices, FALSE, &smallest_face_remap); - ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " - "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); } static HRESULT clear_normals(ID3DXMesh *mesh) -- 2.24.1

3 2

[PATCH 2/2] fsutil: Add support for creating hardlinks
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

From: Micheal Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22749

1 0

[PATCH 1/2] winbase.h: Support using int for LONG in MSVC interlocked functions.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winbase.h | 53 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-)

1 0

[PATCH] directmanipulation: New stub dll
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] include/xapo.idl: Add XAPO registration flags
by Andrew Eikum 28 Apr '20

28 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- include/xapo.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/xapo.idl b/include/xapo.idl index 7b28ac9f43..841793d4fa 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -20,6 +20,13 @@ import "unknwn.idl"; #define XAPO_REGISTRATION_STRING_LENGTH 256 +cpp_quote("#define XAPO_FLAG_CHANNELS_MUST_MATCH 0x1") +cpp_quote("#define XAPO_FLAG_FRAMERATE_MUST_MATCH 0x2") +cpp_quote("#define XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH 0x4") +cpp_quote("#define XAPO_FLAG_BUFFERCOUNT_MUST_MATCH 0x8") +cpp_quote("#define XAPO_FLAG_INPLACE_SUPPORTED 0x10") +cpp_quote("#define XAPO_FLAG_INPLACE_REQUIRED 0x20") + cpp_quote("#if 0") typedef struct WAVEFORMATEX { -- 2.26.2

1 0

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] server: Delay setting system registers until suspending select is waken.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] server: Don't try to synchronize system registers on not initialized threads in get_thread_context request.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0