wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Huw Davies : rpcrt4/tests: Remove an unnecessary and confusing message.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 225c43b8124aaeb4c2e307379ab98036db1a38b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225c43b8124aaeb4c2e307379… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 1 14:15:49 2016 +0100 rpcrt4/tests: Remove an unnecessary and confusing message. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d260827..23b9e36 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -431,13 +431,10 @@ static void test_I_RpcMapWin32Status(void) RPC_STATUS rpc_status; BOOL w2k3_up = FALSE; - /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ + /* Windows 2003 and above return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); if (win32status == STATUS_UNSUCCESSFUL) - { - trace("We are on Windows 2003 or Vista\n"); w2k3_up = TRUE; - } /* On Windows XP-SP1 and below some statuses are not mapped and return * the given status

1 0

Huw Davies : user32: EC_USEFONTINFO behaviour depends on whether the font' s charset is CJK or not.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: c247a36eedb5a046921bec1a0440a1ac144642d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c247a36eedb5a046921bec1a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 1 11:35:10 2016 +0100 user32: EC_USEFONTINFO behaviour depends on whether the font's charset is CJK or not. In the non-CJK case, the margins are half of the width returned by GdiGetCharDimensions() but only if the client rect's width is above a certain size. There is an exception if the client rect is empty if the font is sufficiently small. In the CJK case, the margins are independent of the client rect size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 60 ++++++++++--------- dlls/user32/tests/edit.c | 153 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 147 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c247a36eedb5a046921be…

1 0

Alexandre Julliard : server: Don' t release the clipboard owner window when the owner thread terminates.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 2b8021d4d00e2e3c8cc4fd0c36ed0798bb19c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8021d4d00e2e3c8cc4fd0c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 22:13:53 2016 +0900 server: Don't release the clipboard owner window when the owner thread terminates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 18 ++++++++++++++++++ server/clipboard.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 7e0e41c..360ec8d 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -57,6 +57,14 @@ static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) return 0; } +static DWORD WINAPI open_and_empty_clipboard_win_thread(LPVOID arg) +{ + HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + ok(OpenClipboard(hwnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); + return 0; +} + static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) { HWND hwnd = arg; @@ -329,6 +337,8 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); @@ -347,6 +357,14 @@ static void test_ClipboardOwner(void) ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + run_thread( open_and_empty_clipboard_thread, GetDesktopWindow(), __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner window %p / %p\n", + GetClipboardOwner(), GetDesktopWindow() ); + + run_thread( open_and_empty_clipboard_win_thread, 0, __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); } static void test_RegisterClipboardFormatA(void) diff --git a/server/clipboard.c b/server/clipboard.c index 21e6c9e..323fdb9 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -220,7 +220,7 @@ void cleanup_clipboard_thread(struct thread *thread) if ((clipboard = winstation->clipboard)) { - if (thread == clipboard->owner_thread) release_clipboard( clipboard ); + if (thread == clipboard->owner_thread) clipboard->owner_thread = NULL; if (thread == clipboard->open_thread) { user_handle_t viewer = close_clipboard( clipboard );

1 0

Alexandre Julliard : server: Add a release_clipboard request, and notify the owner and viewer on release.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: bddab0e7f8037e1eebebf4234ca883151389488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddab0e7f8037e1eebebf4234… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 20:06:09 2016 +0900 server: Add a release_clipboard request, and notify the owner and viewer on release. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 11 ++++++++--- dlls/user32/tests/clipboard.c | 36 ++++++++++++++++++++++++++++++++---- dlls/user32/win.c | 4 ++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/clipboard.c | 40 +++++++++++++++++++++++++++++----------- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 14 ++++++++++++++ 8 files changed, 117 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddab0e7f8037e1eebebf…

1 0

Alexandre Julliard : ole32: Cope with receiving WM_RENDERALLFORMATS even when the clipboard is empty.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 27a73216c04e512d848d3df36338f074437d86b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a73216c04e512d848d3df36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 22:01:44 2016 +0900 ole32: Cope with receiving WM_RENDERALLFORMATS even when the clipboard is empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2cc1cfa..e3c93c9 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2040,10 +2040,12 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, case WM_RENDERALLFORMATS: { DWORD i; - ole_priv_data_entry *entries = clipbrd->cached_enum->entries; + ole_priv_data_entry *entries; TRACE("(): WM_RENDERALLFORMATS\n"); + if (!clipbrd || !clipbrd->cached_enum) break; + entries = clipbrd->cached_enum->entries; for(i = 0; i < clipbrd->cached_enum->count; i++) { if(entries[i].first_use)

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawIndexedPrimitiveUP().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 2adcec346c0cb9c77a7b279aaa1e7b5ea5b4bcc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2adcec346c0cb9c77a7b279aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:44 2016 +0200 d3d8: Use resource mapping functions in d3d8_device_DrawIndexedPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fc1d220..33ff7a5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2122,11 +2122,12 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; - BYTE *buffer_data; - UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; UINT idx_size = idx_count * idx_fmt_size; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT ib_pos; UINT vtx_size = vertex_count * vertex_stride; @@ -2157,12 +2158,14 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, vertex_data, vtx_size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d8_device_prepare_index_buffer(device, idx_size); @@ -2177,12 +2180,14 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface else ib_pos += align; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &buffer_data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, index_data, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, index_data, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride);

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 0338e10a73dc2a2fa5cf259af885243b4241f0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0338e10a73dc2a2fa5cf259af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:43 2016 +0200 d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0e3b5cc..fc1d220 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2034,9 +2034,11 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2060,12 +2062,14 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, data, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, data, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 612071c365941c4ea5c37e3fe175448c2f77eeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612071c365941c4ea5c37e3fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:42 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8cebe65..c7a516e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4372,7 +4372,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); DWORD stride = get_flexible_vertex_size(vb_impl->fvf); - WORD *index_data; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib; HRESULT hr; UINT ib_pos; @@ -4412,16 +4414,18 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, * method could be created which takes an user pointer containing the * indices or a SetData-Method for the index buffer, which overrides the * index buffer data with our pointer. */ - hr = wined3d_buffer_map(device->index_buffer, ib_pos, index_count * sizeof(WORD), - (BYTE **)&index_data, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + index_count * sizeof(WORD); + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) { ERR("Failed to map buffer, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(index_data, indices, index_count * sizeof(WORD)); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, index_count * sizeof(WORD)); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveStrided ().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: a8da2f35af2acd1d145198bbd44cdc2ef148b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8da2f35af2acd1d145198bbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:41 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveStrided(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4cb244a..8cebe65 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4143,8 +4143,10 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, UINT vtx_dst_stride = get_flexible_vertex_size(fvf); UINT vtx_dst_size = vertex_count * vtx_dst_stride; UINT idx_size = index_count * sizeof(WORD); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT vb_pos, align; - BYTE *dst_data; UINT ib_pos; HRESULT hr; @@ -4172,12 +4174,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_dst_size, &dst_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_dst_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - pack_strided_data(dst_data, vertex_count, strided_data, fvf); - wined3d_buffer_unmap(device->vertex_buffer); + pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_dst_size; hr = d3d_device_prepare_index_buffer(device, idx_size); @@ -4187,12 +4191,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, if (device->index_buffer_size - idx_size < ib_pos) ib_pos = 0; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &dst_data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(dst_data, indices, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vtx_dst_stride);

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawPrimitiveStrided().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: f72b682d4994febd3fa0e9db1e76cfe44751fc1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f72b682d4994febd3fa0e9db1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:40 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawPrimitiveStrided(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 55eb981..4cb244a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4030,8 +4030,10 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM HRESULT hr; UINT dst_stride = get_flexible_vertex_size(fvf); UINT dst_size = dst_stride * vertex_count; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *dst_data; TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, vertex_count %u, flags %#x.\n", iface, primitive_type, fvf, strided_data, vertex_count, flags); @@ -4055,12 +4057,14 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, dst_size, &dst_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + dst_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - pack_strided_data(dst_data, vertex_count, strided_data, fvf); - wined3d_buffer_unmap(device->vertex_buffer); + pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + dst_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, dst_stride);

1 0

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 September 2016