January 2019 - Wine-Devel - list.winehq.org

[PATCH v2] crypt32: Add missing CRYPT_STRING dwFlags enums.
by Thanasis Papoutsidakis Jan. 7, 2019

Jan. 7, 2019

1 0

[PATCH 3/4] d3d9/tests: Add test for base vertex index with sysmem vertex buffers.
by Józef Kucia Jan. 7, 2019

Jan. 7, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 195b7301e0bb..51229f2b8268 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24234,6 +24234,11 @@ static void test_sysmem_draw(void) {-1.0f, 1.0f, 0.0f}, { 1.0f, -1.0f, 0.0f}, { 1.0f, 1.0f, 0.0f}, + + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, }; static const DWORD quad_s1[] = { @@ -24241,6 +24246,11 @@ static void test_sysmem_draw(void) 0xff00ff00, 0xff0000ff, 0xffffffff, + + 0xff443322, + 0xff443322, + 0xff443322, + 0xff443322, }; static const short indices[] = {0, 1, 2, 3}; @@ -24349,6 +24359,19 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 4/4] d3d8/tests: Add test for base vertex index with sysmem vertex buffers.
by Józef Kucia Jan. 7, 2019

Jan. 7, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 25f96fd3dd5f..cdb467087634 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10485,6 +10485,11 @@ static void test_sysmem_draw(void) {-1.0f, 1.0f, 0.0f}, { 1.0f, -1.0f, 0.0f}, { 1.0f, 1.0f, 0.0f}, + + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, }; static const DWORD quad_s1[] = { @@ -10492,6 +10497,11 @@ static void test_sysmem_draw(void) 0xff00ff00, 0xff0000ff, 0xffffffff, + + 0xff443322, + 0xff443322, + 0xff443322, + 0xff443322, }; static const short indices[] = {0, 1, 2, 3}; @@ -10600,6 +10610,22 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 4); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 1/4] d3d8: Upload vertex buffer range relative to base vertex index.
by Józef Kucia Jan. 7, 2019

Jan. 7, 2019

Fixes a regression introduced by 75b7ff60562880b6e7b646a8fa84486670162d00. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46357 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b4d445d63d38..334812540e86 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2344,6 +2344,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int index_count; + int base_vertex_index; HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", @@ -2351,7 +2352,8 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); - d3d8_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); + d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); -- 2.19.2

3 2

[PATCH 2/4] d3d9: Upload vertex buffer range relative to base vertex index.
by Józef Kucia Jan. 7, 2019

Jan. 7, 2019

Fixes a regression introduced by b18a53a5b44b651cde8e05200c75eacf54f49926. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c1418e99118b..e28b48e88d2d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2708,7 +2708,7 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) } static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, - unsigned int start_vertex, unsigned int vertex_count) + int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d9_vertexbuffer *d3d9_buffer; @@ -2716,6 +2716,14 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, struct wined3d_buffer *dst_buffer; HRESULT hr; + if (!device->sysmem_vb) + return; + + if (base_vertex >= 0 || start_vertex >= -base_vertex) + start_vertex += base_vertex; + else + FIXME("System memory vertex data offset is negative.\n"); + map = device->sysmem_vb; while (map) { @@ -2777,7 +2785,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - d3d9_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); + d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -2809,7 +2817,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - d3d9_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); -- 2.19.2

3 2

[PATCH] crypt32: Add missing CRYPT_STRING dwFlags enums.
by Thanasis Papoutsidakis Jan. 7, 2019

Jan. 7, 2019

Two new option enums were introduced (Vista+) for CryptBinaryToString et al (base64.c). Adding their enum definitions to support future implementations. Signed-off-by: Thanasis Papoutsidakis <pwnzorbot4000(a)gmail.com> --- include/wincrypt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index bcb67ff091..85be699fd0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2833,6 +2833,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CRYPT_STRING_BASE64X509CRLHEADER 0x00000009 #define CRYPT_STRING_HEXADDR 0x0000000a #define CRYPT_STRING_HEXASCIIADDR 0x0000000b +#define CRYPT_STRING_HEXRAW 0x0000000c +#define CRYPT_STRING_STRICT 0x20000000 #define CRYPT_STRING_NOCRLF 0x40000000 #define CRYPT_STRING_NOCR 0x80000000 -- 2.20.1

2 1

[PATCH] kernel32/tests: Initialize input buffer in test_overlapped_transport.
by Jacek Caban Jan. 7, 2019

Jan. 7, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46341 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/2] testbot: Tweak the mission descriptions for WoW tests.
by Francois Gouget Jan. 7, 2019

Jan. 7, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 26623405..93cd7872 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -111,6 +111,7 @@ sub GetTaskMissionDescription($$) ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" : $Builds->{exe32} ? "32 bit" : $Builds->{exe64} ? "64 bit" : + ($Builds->{wow64} and $Builds->{wow32} and !$Builds->{win32}) ? "32 & 64 bit WoW" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : $Builds->{win32} ? "32 bit" : $Builds->{wow32} ? "32 bit WoW" : -- 2.20.1

1 1

[PATCH] testbot/WineRunReconfig: Also retrieve the wine-parentsrc.txt file.
by Francois Gouget Jan. 7, 2019

Jan. 7, 2019

It is needed to properly handle patches to modules with the PARENTSRC setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c9025c13..9bb402a6 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -433,14 +433,17 @@ if ($NewStatus eq "completed") } } - Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); - if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) + foreach my $FileName ("winefiles.txt", "wine-parentsrc.txt") { - copy "$TaskDir/winefiles.txt", "$DataDir/latest/winefiles.txt"; - } - elsif (!defined $TAError) - { - $TAError = "An error occurred while retrieving the list of Wine files: ". $TA->GetLastError(); + Debug(Elapsed($Start), " Retrieving '$TaskDir/$FileName'\n"); + if ($TA->GetFile("latest/$FileName", "$TaskDir/$FileName")) + { + copy "$TaskDir/$FileName", "$DataDir/latest/$FileName"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving '$TaskDir/$FileName': ". $TA->GetLastError(); + } } } -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H Jan. 7, 2019

Jan. 7, 2019

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is changing protection for two pages (current and next). Also added "goto error" for VirtualProtect call for the current page. This change is safe because if it failed before this change updating the page content would crash anyway. Commit fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46401 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 48b309f3d6..0c32e12801 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3318,8 +3318,9 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; + DWORD old, old_next_page; IMAGE_BASE_RELOCATION *rel, *end; + void *page, *next_page = NULL; if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { @@ -3327,13 +3328,33 @@ static HMODULE load_driver_module( const WCHAR *name ) end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); + page = (char *)module + rel->VirtualAddress; + /* if the page protection was already changed in previous interation don't do it again here */ + if (page == next_page) + old = old_next_page; + else + { + /* bring back old protection for 'next_page' from previous iteration */ + if (old_next_page != PAGE_EXECUTE_READWRITE) + VirtualProtect( next_page, info.PageSize, old_next_page, &old_next_page ); + /* change current page protection */ + if (!VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old )) + goto error; + } + + /* protect the next page as well because relocation can occur on the page boundary */ + next_page = (char*)page + info.PageSize; + if (!VirtualProtect( next_page, info.PageSize, PAGE_EXECUTE_READWRITE, &old_next_page )) + next_page = NULL; + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + /* bring back old protection of current page; next page is handled in the next iteration */ if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); if (!rel) goto error; } + if (next_page && old_next_page != PAGE_EXECUTE_READWRITE) + VirtualProtect( next_page, info.PageSize, old_next_page, &old_next_page ); /* make sure we don't try again */ size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; VirtualProtect( nt, size, PAGE_READWRITE, &old ); -- 2.17.1

3 2