November 2017 - Wine-devel - list.winehq.org

[PATCH 1/4] wined3d: Fix SM4 discard_z instruction.
by Józef Kucia 24 Nov '17

24 Nov '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=43131 --- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/shader_sm4.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0ff9ee44bb26..31810d6ddf29 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6606,10 +6606,11 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { + const char *condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) discard;\n", condition, src_param.param_str); } else { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3707d1587f9d..c4eed76d78f0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2958,7 +2958,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_BREAKP || ins.handler_idx == WINED3DSIH_CONTINUEP || ins.handler_idx == WINED3DSIH_IF - || ins.handler_idx == WINED3DSIH_RETP) + || ins.handler_idx == WINED3DSIH_RETP + || ins.handler_idx == WINED3DSIH_TEXKILL) { switch (ins.flags) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a04debe264d9..2665a67b80a6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -894,7 +894,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, - {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "f", "ff"}, {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "f", "ff"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "f", "ff"}, -- 2.13.6

2 4

[PATCH 1/2] d3d11: Test shader class instance count
by Lucian Poston 23 Nov '17

23 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 59f2e6ef9f..615d7c1096 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8622,7 +8622,7 @@ static void test_clear_state(void) UINT sample_mask; UINT stencil_ref; ULONG refcount; - UINT count, i; + UINT count, i, instance_count; HRESULT hr; device_desc.feature_level = &feature_level; @@ -8653,8 +8653,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8672,8 +8675,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8691,8 +8697,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8710,8 +8719,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8730,8 +8742,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -8750,8 +8765,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 2.13.6

1 1

[PATCH 3/3] mshtml: Added IHTMLDOMNode3::compareDocumentPosition implementation.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-)

1 0

[PATCH 2/3] mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 14 ++++---------- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/persist.c | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-)

1 0

[PATCH 1/3] mshtml: Removed no longer needed flush_pending_tasks.
by Jacek Caban 23 Nov '17

23 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/task.c | 19 ------------------- 3 files changed, 22 deletions(-)

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 23 Nov '17

23 Nov '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 58 +++++++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1056482d06..e6df9dedf3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8914,10 +8914,8 @@ msgid " sec" msgstr " s" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Valitse kansio" +msgstr "Valitse lähde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10576,6 +10574,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Luo symbolinen linkki.\n" +"\n" +"Syntaksi: MKLINK [valitsimet] linkin_nimi kohde\n" +"\n" +"Valitsimet:\n" +"/d Luo symbolinen linkki hakemistoon.\n" +"/h Luo kova linkki.\n" +"/j Luo hakemistoliitos.\n" +"linkin_nimi on uuden symbolisen linkin nimi.\n" +"kohde on polku, johon linkki osoittaa.\n" #: cmd.rc:312 msgid "" @@ -10586,47 +10594,6 @@ msgstr "" "komentoriville, jolta kutsuit cmd:tä.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10685,6 +10652,7 @@ msgstr "" "FTYPE\t\tNäytä tai muuta tiedostotyyppeihin liitettyjä avoimia komentoja\n" "HELP\t\tNäytä aiheeseen liittyviä lyhyitä yksityiskohtia\n" "MD (MKDIR)\tLuo alihakemisto\n" +"MKLINK\t\tLuo symbolinen linkki\n" "MORE\t\tNäytä tuloste sivuina\n" "MOVE\t\tSiirrä tiedostoa, tiedostojoukkoa tai hakemistopuuta\n" "PATH\t\tAseta tai näytä hakupolku\n" @@ -14961,7 +14929,7 @@ msgstr "Miinoja" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Kaikki tulokset hävitetään. Oletko varma?" #: winemine.rc:30 msgid "WineMine" -- 2.15.0

1 0

[PATCH] regedit: Do not abort if the /m switch is used
by Hugh McMaster 23 Nov '17

23 Nov '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2d724f9bdf..fe0163c56e 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -209,6 +209,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; case 'C': case 'L': + case 'M': case 'R': /* unhandled */; break; -- 2.15.0

1 0

[PATCH] reg/tests: Properly escape the backslashes in an export test
by Hugh McMaster 23 Nov '17

23 Nov '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e0ff5f0e55..0bab8bc2af 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4391,7 +4391,7 @@ static void test_export(void) run_reg_exe("reg export /?", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r); -- 2.15.0

1 0

[PATCH] kernel32: Adjust data directories in UpdateResource API.
by David Collett 23 Nov '17

23 Nov '17

When adding resources to a PE file using the UpdateResource API and the resource section is not the last section (i.e. we had to move existing sections), ensure any data directory entries pointing into moved sections is adjusted. Fixes issue where binaries commonly have relocations section after the resource section. If the resources section is extended, the base relocations data directory entry will no longer be valid and the binary will fail to be loaded (assuming relocation is required). Signed-off-by: David Collett <david.collett(a)gmail.com> --- dlls/kernel32/resource.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c88c921..d526b39 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1615,15 +1615,29 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + DWORD i; nt64->OptionalHeader.SizeOfImage += rva_delta; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++) { + if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) { + nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; + } + } } else { + DWORD i; nt->OptionalHeader.SizeOfImage += rva_delta; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++) { + if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) { + nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; + } + } } } -- 2.7.4

1 0

[v2 PATCH 0/6] Add d2d device context
by Lucian Poston 23 Nov '17

23 Nov '17

The final 6/6 patch with ID2D1Bitmap1 implementation will come later once these first ones are ready. Changes since v1, * Fixed idl issues pointed out by nsivov. * Squashed stub and implementation patches together into one commit. * Reorganized patch series so that each patch individually passes tests. * Switched internal implementations to use ID2D1Factory1 e.g. in geometry.c. * In test, replaced d3d11 device with d3d10 in order to reuse existing helper functions in other d2d1 tests, as requested in v1 review. * Removed NULL checks as requested in v1 review. * Reordered interface conditional check in QueryInterface per v1 review. * Renamed several identifiers as requested in v1 review. Lucian Poston (5): d2d1: Add d2d1_1.idl d2d1: Add test that draws using d2d device context d2d1: Stub ID2D1Factory1 d2d1: Partially implement ID2D1Device d2d1: Partially implement ID2D1DeviceContext dlls/d2d1/Makefile.in | 2 + dlls/d2d1/d2d1_private.h | 36 +- dlls/d2d1/device.c | 191 +++++++ dlls/d2d1/device_context.c | 1180 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 193 ++++++-- dlls/d2d1/geometry.c | 30 +- dlls/d2d1/render_target.c | 82 ++- dlls/d2d1/tests/d2d1.c | 105 ++++ dlls/uuid/d2d.c | 1 + include/Makefile.in | 1 + include/d2d1_1.idl | 655 ++++++++++++++++++++++++ include/dcommon.idl | 15 + 12 files changed, 2420 insertions(+), 71 deletions(-) create mode 100644 dlls/d2d1/device.c create mode 100644 dlls/d2d1/device_context.c create mode 100644 include/d2d1_1.idl -- 2.13.6

2 9