January 2019 - Wine-commits

Zebediah Figura : ntoskrnl.exe: Implement PsTerminateSystemThread().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 08ba44618d0f57b21c9b20d90464e9dfbb1dc579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ba44618d0f57b21c9b20d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:24 2019 -0600 ntoskrnl.exe: Implement PsTerminateSystemThread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4986ca1..ec78f4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2803,10 +2803,10 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) +NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) { - FIXME( "stub: %u\n", ExitStatus ); - return STATUS_NOT_IMPLEMENTED; + TRACE("status %#x.\n", status); + ExitThread( status ); }

1 0

Alexandre Julliard : ntdll: Round header size to page boundary before checking it in PE header conversion.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 96eebec967ebdef720f4f4d7adbc3ea8e19264a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96eebec967ebdef720f4f4d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 12:46:37 2019 +0100 ntdll: Round header size to page boundary before checking it in PE header conversion. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 631e8bd..ecc09d3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1935,16 +1935,21 @@ static BOOL convert_to_pe64( HMODULE module, const pe_image_info_t *info ) IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); SIZE_T hdr_size = min( sizeof(hdr32), nt->FileHeader.SizeOfOptionalHeader ); IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + hdr_size); - SIZE_T size = (char *)(nt + 1) + nt->FileHeader.NumberOfSections * sizeof(*sec) - (char *)module; + SIZE_T size = info->header_size; void *addr = module; ULONG i, old_prot; TRACE( "%p\n", module ); - if (size > info->header_size) return FALSE; if (NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &old_prot )) return FALSE; + if ((char *)module + size < (char *)(nt + 1) + nt->FileHeader.NumberOfSections * sizeof(*sec)) + { + NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, old_prot, &old_prot ); + return FALSE; + } + memcpy( &hdr32, &nt->OptionalHeader, hdr_size ); memcpy( &hdr64, &hdr32, offsetof( IMAGE_OPTIONAL_HEADER64, SizeOfStackReserve )); hdr64.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC;

1 0

Alexandre Julliard : ntdll: Support loading old runtime versions of IL-only images.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: c87aa2b9fcfc0d824f819e81279948d14fdb8e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c87aa2b9fcfc0d824f819e81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 15:29:53 2019 +0100 ntdll: Support loading old runtime versions of IL-only images. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 5 +++-- dlls/ntdll/loader.c | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 01c7cfa..23dfc93 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -522,13 +522,14 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); if (!has_code && nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { - BOOL il_only = FALSE; + BOOL il_only = FALSE, want_32bit = FALSE; if (((const IMAGE_NT_HEADERS32 *)nt_header)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress) { const IMAGE_COR20_HEADER *cor_header = section_data; il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; + if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; } - ok( mod != NULL || broken(il_only), /* <= win7 */ + ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ "%u: loading failed err %u\n", line, GetLastError() ); } else diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index ecc09d3..a47dfe0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1989,7 +1989,14 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->contains_code) return TRUE; - if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) return FALSE; + if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + { + /* check COM header directly, ignoring runtime version */ + DWORD size; + const IMAGE_COR20_HEADER *cor_header = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); + if (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; + } return convert_to_pe64( module, info ); #else return FALSE; /* no wow64 support on other platforms */

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_geometry_shader().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: d94ae444d29eb9175740e9a72913a6aa2ad16f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94ae444d29eb9175740e9a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:07 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_geometry_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f61eba..dddc4e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2830,15 +2830,15 @@ struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3 void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]; TRACE("device %p, shader %p.\n", device, shader); - if (device->recording || shader == prev) + if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; + device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); if (prev) wined3d_shader_decref(prev);

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_compute_shader().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: a6cd109ad6105d8cf05597af5ac6f6b4acfa2b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6cd109ad6105d8cf05597af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:08 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_compute_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dddc4e6..ea7d60f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2887,12 +2887,12 @@ void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, stru TRACE("device %p, shader %p.\n", device, shader); - prev = device->update_state->shader[WINED3D_SHADER_TYPE_COMPUTE]; - if (device->recording || shader == prev) + prev = device->state.shader[WINED3D_SHADER_TYPE_COMPUTE]; + if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; + device->state.shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_COMPUTE, shader); if (prev) wined3d_shader_decref(prev);

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_predication().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 9415066f6e63b6e8df1f8b7f4ad37bdf43e9a60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9415066f6e63b6e8df1f8b7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:09 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_predication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea7d60f..a7e274d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3656,16 +3656,15 @@ void CDECL wined3d_device_set_predication(struct wined3d_device *device, TRACE("device %p, predicate %p, value %#x.\n", device, predicate, value); - prev = device->update_state->predicate; + prev = device->state.predicate; if (predicate) { FIXME("Predicated rendering not implemented.\n"); wined3d_query_incref(predicate); } - device->update_state->predicate = predicate; - device->update_state->predicate_value = value; - if (!device->recording) - wined3d_cs_emit_set_predication(device->cs, predicate, value); + device->state.predicate = predicate; + device->state.predicate_value = value; + wined3d_cs_emit_set_predication(device->cs, predicate, value); if (prev) wined3d_query_decref(prev); }

1 0

Zebediah Figura : d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: ca86c2ed84a6e59f21d3d66e25643de15712ef3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca86c2ed84a6e59f21d3d66e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:10 2019 -0600 d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 896a730..f17032d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2874,6 +2874,7 @@ static void test_draw_primitive(void) IDirect3DVertexBuffer9 *vertex_buffer, *current_vb; IDirect3DIndexBuffer9 *index_buffer, *current_ib; IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DStateBlock9 *stateblock; IDirect3DDevice9 *device; UINT offset, stride; IDirect3D9 *d3d9; @@ -2998,16 +2999,81 @@ static void test_draw_primitive(void) 0 /* MinIndex */, 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); +todo_wine + ok(!stride, "Unexpected stride %u.\n", stride); + if (current_vb) + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + if (current_ib) + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DStateBlock9_Capture(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); IDirect3DVertexBuffer9_Release(vertex_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexDeclaration9_Release(vertex_declaration);

1 0

Zebediah Figura : d3d8/tests: Port test_draw_primitive() from d3d9.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 38fb14a688641a3a93c135c6bc6e4721e0529df8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38fb14a688641a3a93c135c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:11 2019 -0600 d3d8/tests: Port test_draw_primitive() from d3d9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5f8c0eb..97c2747 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9319,6 +9319,186 @@ static void test_multiply_transform(void) DestroyWindow(window); } +static void test_draw_primitive(void) +{ + static const struct + { + float position[3]; + DWORD color; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + }; + static const WORD indices[] = {0, 1, 2, 3, 0, 2}; + + IDirect3DVertexBuffer8 *vertex_buffer, *current_vb; + IDirect3DIndexBuffer8 *index_buffer, *current_ib; + UINT stride, base_vertex_index; + IDirect3DDevice8 *device; + DWORD stateblock; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *ptr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, + D3DPOOL_DEFAULT, &vertex_buffer); + ok(SUCCEEDED(hr), "CreateVertexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vertex_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer8_Unlock(vertex_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, + D3DPOOL_DEFAULT, &index_buffer); + ok(SUCCEEDED(hr), "CreateIndexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DIndexBuffer8_Lock(index_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(index_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState D3DRS_LIGHTING failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); + + /* NULL index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, NULL, 0); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + todo_wine ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + /* Valid index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine { + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); +} + if (current_vb) + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine { + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); +} + if (current_ib) + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Apply failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + IDirect3DDevice8_DeleteStateBlock(device, stateblock); + IDirect3DVertexBuffer8_Release(vertex_buffer); + IDirect3DIndexBuffer8_Release(index_buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9433,6 +9613,7 @@ START_TEST(device) test_get_info(); test_resource_access(); test_multiply_transform(); + test_draw_primitive(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : wined3d: Move wined3d_bit_scan() to public header.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b51bc84338455dca41c6704e3fee4cbda6b440e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51bc84338455dca41c6704e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 09:46:52 2019 +0100 wined3d: Move wined3d_bit_scan() to public header. wine/port.h is required for ffs(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 1 + dlls/d3d8/d3d8_main.c | 1 + dlls/d3d8/directx.c | 1 + dlls/d3d8/shader.c | 1 + dlls/d3d8/surface.c | 1 + dlls/d3d8/swapchain.c | 1 + dlls/d3d8/texture.c | 1 + dlls/d3d8/vertexdeclaration.c | 6 +----- dlls/d3d8/volume.c | 1 + dlls/d3d9/buffer.c | 1 + dlls/d3d9/d3d9_main.c | 1 + dlls/d3d9/directx.c | 1 + dlls/d3d9/query.c | 1 + dlls/d3d9/shader.c | 1 + dlls/d3d9/stateblock.c | 1 + dlls/d3d9/surface.c | 1 + dlls/d3d9/swapchain.c | 1 + dlls/d3d9/texture.c | 1 + dlls/d3d9/vertexdeclaration.c | 1 + dlls/d3d9/volume.c | 1 + dlls/wined3d/wined3d_private.h | 7 ------- include/wine/wined3d.h | 11 +++++++++-- 22 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 3b98000..0a6767b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 92c5032..a6c6700 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "initguid.h" #include "d3d8_private.h" #include "wine/debug.h" diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d978827..09188cc 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 2a4fbde..6c16633 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 7f90389..0d87937 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index c9abfff..186e3cd 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ccbf60e..6f17e9d 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 0cae3cd..709e04b 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -1,6 +1,4 @@ /* - * IDirect3DVertexDeclaration8 implementation - * * Copyright 2007 Henri Verbeet * * This library is free software; you can redistribute it and/or @@ -18,10 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* IDirect3DVertexDeclaration8 is internal to our implementation. - * It's not visible in the API. */ - #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 29eab6a..00dd78a 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 840d7e9..b6cd646 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index c23fa54..bd0524b 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include "initguid.h" #include "d3d9_private.h" diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 3f9c188..eab114d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 12ff95b..49a8a12 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index bc34738..5493508 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 6f39488..8431ef7 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 7d4d93b5e8..ded7dc4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 00ead0f..46da32e 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c73cbc0..8dc1cee 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 5075309..b644525 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index cb0485c..7bf1257 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0df3f2a..7b265f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4582,13 +4582,6 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } -static inline int wined3d_bit_scan(unsigned int *x) -{ - int bit_offset = ffs(*x) - 1; - *x ^= 1u << bit_offset; - return bit_offset; -} - static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b0b1abc..06f4f76 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,8 +26,8 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header +#ifndef __WINE_WINE_PORT_H +# error You must include wine/port.h to use this header #endif #include "wine/list.h" @@ -2782,6 +2782,13 @@ static inline unsigned int wined3d_log2i(unsigned int x) #endif } +static inline int wined3d_bit_scan(unsigned int *x) +{ + int bit_offset = ffs(*x) - 1; + *x ^= 1u << bit_offset; + return bit_offset; +} + static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom, unsigned int front, unsigned int back) {

1 0

Józef Kucia : d3d8: Use wined3d_bit_scan() instead of open-coding it.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 5c3d4f39e2a332f732d85f3beb4fa5d475f118fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c3d4f39e2a332f732d85f3b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 09:46:53 2019 +0100 d3d8: Use wined3d_bit_scan() instead of open-coding it. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d892ec..33ab34d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2280,8 +2280,7 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); @@ -2618,8 +2617,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride))) @@ -2636,8 +2634,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride)))

1 0