wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Henri Verbeet : d3d8: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: dc3221a9c8cbc967ddd4036917f0cb5b4caff205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3221a9c8cbc967ddd40369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 22:15:43 2019 +0330 d3d8: Avoid calling wined3d_device_process_vertices() with unmappable source buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3348125..b2a6e48 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2592,14 +2592,54 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *dst = unsafe_impl_from_IDirect3DVertexBuffer8(dst_buffer); + struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cbe6c97..43b286b 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10596,12 +10596,12 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w);

1 0

Henri Verbeet : d3d9: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: 36180aa1958273320630c85fd5d7dfc75c5ffb4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36180aa1958273320630c85f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 19:52:47 2019 +0330 d3d9: Avoid calling wined3d_device_process_vertices() with unmappable source buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e28b48e..9ebaeba 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3082,15 +3082,55 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *dst_impl = unsafe_impl_from_IDirect3DVertexBuffer9(dst_buffer); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); + struct d3d9_vertexbuffer *d3d9_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d9_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d9_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 677286e..b4f512e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24327,12 +24327,12 @@ static void test_sysmem_draw(void) 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, NULL, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(dst_vb, 0, 0, (void **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w);

1 0

Henri Verbeet : d3d8/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: da50331bdeb0af735639520875b2a65a57a3b5dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=da50331bdeb0af7356395208… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 22:15:42 2019 +0330 d3d8/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 82 ++++++++++++++++++++++++++++++++++++++++++++---- include/d3d8.h | 2 +- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cdb4670..cbe6c97 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -19,6 +19,7 @@ /* See comment in dlls/d3d9/tests/visual.c for general guidelines */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -62,6 +63,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -10448,11 +10473,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb; + D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; + struct vec4 *dst_data; IDirect3D8 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -10474,10 +10502,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -10510,7 +10538,17 @@ static void test_sysmem_draw(void) d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, window, TRUE))) + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_MIXED_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d); @@ -10547,6 +10585,37 @@ 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_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer8_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10633,6 +10702,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer8_Release(vb_s0); IDirect3DDevice8_DeleteVertexShader(device, vs); IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(dst_vb); IDirect3DVertexBuffer8_Release(vb); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/include/d3d8.h b/include/d3d8.h index d56e67f..51eed8b 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->processVertices(p,a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a)

1 0

Henri Verbeet : d3d9/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: 9b1b589442ce71eb3cf8e3140325fa4e7c1c3f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1b589442ce71eb3cf8e314… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 19:52:45 2019 +0330 d3d9/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 55 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2..677286e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28,6 +28,7 @@ * causes visible results in games can be tested in a way that does not depend on pixel exactness */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -73,6 +74,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -24199,12 +24224,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { + IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb; IDirect3DVertexDeclaration9 *vertex_declaration; - IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1; IDirect3DIndexBuffer9 *ib; IDirect3DDevice9 *device; + struct vec4 *dst_data; IDirect3D9 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -24223,10 +24250,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -24296,6 +24323,23 @@ 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_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, NULL, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(dst_vb, 0, 0, (void **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 1), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer9_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -24379,6 +24423,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer9_Release(vb_s0); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(dst_vb); IDirect3DVertexBuffer9_Release(vb); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Piotr Caban : server: Fix process trace_data initialization race on Mac.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: 9fa65a8751f36eea57d52717c9f8df2c27924458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa65a8751f36eea57d52717… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 8 16:12:27 2019 +0100 server: Fix process trace_data initialization race on Mac. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 7 ++++--- server/process.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 38356f4..094b530 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1419,9 +1419,6 @@ void server_init_process(void) "Or maybe the wrong wineserver is still running?\n", version, SERVER_PROTOCOL_VERSION, (version > SERVER_PROTOCOL_VERSION) ? "wine" : "wineserver" ); -#ifdef __APPLE__ - send_server_task_port(); -#endif #if defined(__linux__) && defined(HAVE_PRCTL) /* work around Ubuntu's ptrace breakage */ if (server_pid != -1) prctl( 0x59616d61 /* PR_SET_PTRACER */, server_pid ); @@ -1440,6 +1437,10 @@ void server_init_process_done(void) NTSTATUS status; int suspend; +#ifdef __APPLE__ + send_server_task_port(); +#endif + /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that * is sent by REQ_INIT_PROCESS_DONE. diff --git a/server/process.c b/server/process.c index 3bd545a..e55c8a8 100644 --- a/server/process.c +++ b/server/process.c @@ -587,7 +587,6 @@ data_size_t init_process( struct thread *thread ) struct process *process = thread->process; struct startup_info *info = process->startup_info; - init_process_tracing( process ); if (!info) return 0; return info->data_size; } @@ -1319,6 +1318,7 @@ DECL_HANDLER(init_process_done) if (process->exe_file) release_object( process->exe_file ); process->exe_file = NULL; + init_process_tracing( process ); generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE );

1 0

Nikolay Sivov : shcore: Fix double free on error path (Coverity).
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: 6bab6ce8e158d30b5dc59d5c642c482d95ea6311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bab6ce8e158d30b5dc59d5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 8 18:18:33 2019 +0300 shcore: Fix double free on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index ac625fb..973b7c7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1244,7 +1244,6 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, const WCHAR *subkey, const WCHAR * } } - heap_free(buff); if (hStrKey) RegCloseKey(hStrKey);

1 0

Józef Kucia : ntoskrnl.exe: Fix service handle leak in ZwLoadDriver() (Coverity).
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: wine Branch: master Commit: ff6eadc6aebb307f2e367c8a3af724c75d7bb3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff6eadc6aebb307f2e367c8a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 8 11:19:20 2019 +0100 ntoskrnl.exe: Fix service handle leak in ZwLoadDriver() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 48b309f..d8a87a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3523,6 +3523,7 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) { TRACE( "driver %s already loaded\n", debugstr_us(&drv_name) ); RtlFreeUnicodeString( &drv_name ); + CloseServiceHandle( (void *)service_handle ); return STATUS_IMAGE_ALREADY_LOADED; }

1 0

Francois Gouget : testbot/testagentd: Add a --set-time-only option.
by Alexandre Julliard 08 Jan '19

08 Jan '19

Module: tools Branch: master Commit: c4b84004cb4268644a38de3f0250f011a8d6034a URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4b84004cb4268644a38de3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 8 00:31:48 2019 +0100 testbot/testagentd: Add a --set-time-only option. When specified the TestAgent server will only allow the settime RPC. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/testagentd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b81f7fa..fbc26ab 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1149,6 +1149,8 @@ static void do_unknown(SOCKET client, uint32_t id) } } +static int opt_set_time_only = 0; + static void process_rpc(SOCKET client) { int r; @@ -1175,7 +1177,12 @@ static void process_rpc(SOCKET client) } debug("-> %s\n", rpc_name(rpcid)); - switch (rpcid) + if (opt_set_time_only && rpcid != RPCID_PING && rpcid != RPCID_SETTIME) + { + set_status(ST_ERROR, "the %s RPC is not allowed", rpc_name(rpcid)); + send_error(client); + } + else switch (rpcid) { case RPCID_PING: do_ping(client); @@ -1359,6 +1366,10 @@ int main(int argc, char** argv) { opt_show_restarts = 1; } + else if (strcmp(*arg, "--set-time-only") == 0) + { + opt_set_time_only = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1430,7 +1441,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--detach] [--help] [--show-restarts] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] [--show-restarts] [--set-time-only] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); @@ -1442,6 +1453,7 @@ int main(int argc, char** argv) printf(" combine this with start: start %s --detach ...\n", name0); printf(" --show-restarts Shows a message if %s has been restarted (for instance\n", name0); printf(" because of a Windows reboot).\n"); + printf(" --set-time-only Only allow the settime RPC.\n"); printf(" --help Shows this usage message.\n"); exit(0); }

1 0

Julian Rüger : German translation for release 4.0-rc5
by Jeremy Newman 08 Jan '19

08 Jan '19

Module: website Branch: master Commit: 630b34a8506e10143c5c5263290378c64bf76eb9 URL: https://source.winehq.org/git/website.git/?a=commit;h=630b34a8506e10143c5c5… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 8 10:58:55 2019 +0100 German translation for release 4.0-rc5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2019010401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2019010401.xml b/news/de/2019010401.xml new file mode 100644 index 0000000..8a4b1f0 --- /dev/null +++ b/news/de/2019010401.xml @@ -0,0 +1,12 @@ +<news> +<date>4. Januar 2019</date> +<title>Wine 4.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 4.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.0-rc4
by Jeremy Newman 08 Jan '19

08 Jan '19

Module: website Branch: master Commit: efa922345ef17737ba93656e7125730b6e40d5b2 URL: https://source.winehq.org/git/website.git/?a=commit;h=efa922345ef17737ba936… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 8 10:47:16 2019 +0100 German translation for release 4.0-rc4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018122801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018122801.xml b/news/de/2018122801.xml new file mode 100644 index 0000000..1e2e877 --- /dev/null +++ b/news/de/2018122801.xml @@ -0,0 +1,12 @@ +<news> +<date>28. Dezember 2018</date> +<title>Wine 4.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 4.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

← Newer
1
...
42
43
44
45
46
47
48
49
50
Older →

Jump to page:

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-commits January 2019