December 2012 - Wine-Commits

Stefan Dösinger : d3d8: Use dynamic buffers for DrawIndexedPrimitiveUP.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 01197730efba8124d94481a187912b3936c68e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01197730efba8124d94481a18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:13 2012 +0100 d3d8: Use dynamic buffers for DrawIndexedPrimitiveUP. --- dlls/d3d8/d3d8_private.h | 3 + dlls/d3d8/device.c | 119 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 115 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 4c50e82..fc79fe1 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -162,6 +162,9 @@ struct d3d8_device struct wined3d_buffer *vertex_buffer; UINT vertex_buffer_size; UINT vertex_buffer_pos; + struct wined3d_buffer *index_buffer; + UINT index_buffer_size; + UINT index_buffer_pos; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e1e8e78..7a13344 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -359,6 +359,8 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (device->vertex_buffer) wined3d_buffer_decref(device->vertex_buffer); + if (device->index_buffer) + wined3d_buffer_decref(device->index_buffer); wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); @@ -605,6 +607,12 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) + { + wined3d_buffer_decref(device->index_buffer); + device->index_buffer = NULL; + device->index_buffer_size = 0; + } wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, @@ -1989,26 +1997,123 @@ done: return hr; } +/* The caller is responsible for wined3d locking */ +static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT min_size) +{ + HRESULT hr; + + if (device->index_buffer_size < min_size || !device->index_buffer) + { + UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer *buffer; + + TRACE("Growing index buffer to %u bytes\n", size); + + hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, + WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); + if (FAILED(hr)) + { + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + return hr; + } + + if (device->index_buffer) + wined3d_buffer_decref(device->index_buffer); + + device->index_buffer = buffer; + device->index_buffer_size = size; + device->index_buffer_pos = 0; + } + return D3D_OK; +} + static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface, - D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT index_count, + D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT vertex_count, UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { 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; + UINT ib_pos; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, index_count %u, primitive_count %u,\n" + UINT vtx_size = vertex_count * vertex_stride; + UINT vb_pos, align; + + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", - iface, primitive_type, min_vertex_idx, index_count, primitive_count, + iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); + if (!primitive_count) + { + WARN("primitive_count is 0, returning D3D_OK\n"); + return D3D_OK; + } + wined3d_mutex_lock(); + + hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); + if (FAILED(hr)) + goto done; + + vb_pos = device->vertex_buffer_pos; + align = vb_pos % vertex_stride; + if (align) align = vertex_stride - align; + if (vb_pos + vtx_size + align > device->vertex_buffer_size) + vb_pos = 0; + 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)) + goto done; + memcpy(buffer_data, vertex_data, vtx_size); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + vtx_size; + + hr = d3d8_device_prepare_index_buffer(device, idx_size); + if (FAILED(hr)) + goto done; + + ib_pos = device->index_buffer_pos; + align = ib_pos % idx_fmt_size; + if (align) align = idx_fmt_size - align; + if (ib_pos + idx_size + align > device->index_buffer_size) + ib_pos = 0; + 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)) + goto done; + memcpy(buffer_data, index_data, idx_size); + wined3d_buffer_unmap(device->index_buffer); + device->index_buffer_pos = ib_pos + idx_size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + if (FAILED(hr)) + goto done; + + wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_indexed_primitive_up(device->wined3d_device, - vertex_count_from_primitive_count(primitive_type, primitive_count), index_data, - wined3dformat_from_d3dformat(index_format), vertex_data, vertex_stride); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN); + wined3d_device_set_base_vertex_index(device->wined3d_device, 0); + +done: + wined3d_mutex_unlock(); return hr; }

1 0

Nikolay Sivov : winedump: Fix argument format for DllMain trace.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 140bfd2823e0b43ab6a84b0a889e074303b973ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=140bfd2823e0b43ab6a84b0a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 19 11:22:29 2012 +0400 winedump: Fix argument format for DllMain trace. --- tools/winedump/output.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 93faca7..fecb885 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -237,10 +237,10 @@ void output_c_preamble (void) } fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " - "lpvReserved)\n{\n" - " TRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n\n" - " switch (fdwReason)\n" + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID " + "reserved)\n{\n" + " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" + " switch (reason)\n" " {\n" " case DLL_WINE_PREATTACH:\n" " return FALSE; /* prefer native version */\n" @@ -253,7 +253,7 @@ void output_c_preamble (void) globals.forward_dll, globals.forward_dll); else fprintf (cfile, - " DisableThreadLibraryCalls(hinstDLL);\n"); + " DisableThreadLibraryCalls(instance);\n"); fprintf (cfile, " break;\n"

1 0

Stefan Dösinger : d3d9: Use a dynamic buffer for DrawPrimitiveUP.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 873603f941ebb4b5c5c818e0fac5638fcfc07ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873603f941ebb4b5c5c818e0f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:14 2012 +0100 d3d9: Use a dynamic buffer for DrawPrimitiveUP. --- dlls/d3d9/d3d9_private.h | 4 ++ dlls/d3d9/device.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 99 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ae8f7c6..866078c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -150,6 +150,10 @@ struct d3d9_device struct fvf_declaration *fvf_decls; UINT fvf_decl_count, fvf_decl_size; + struct wined3d_buffer *vertex_buffer; + UINT vertex_buffer_size; + UINT vertex_buffer_pos; + BOOL in_destruction; BOOL not_reset; BOOL in_scene; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c707e2..32f12d3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -297,6 +297,9 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if } HeapFree(GetProcessHeap(), 0, device->fvf_decls); + if (device->vertex_buffer) + wined3d_buffer_decref(device->vertex_buffer); + wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); @@ -581,6 +584,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); wined3d_mutex_lock(); + + if (device->vertex_buffer) + { + wined3d_buffer_decref(device->vertex_buffer); + device->vertex_buffer = NULL; + device->vertex_buffer_size = 0; + } + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, !device->d3d_parent->extended); @@ -1961,22 +1972,94 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return hr; } +static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = +{ + d3d9_null_wined3d_object_destroyed, +}; + +/* The caller is responsible for wined3d locking */ +static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UINT min_size) +{ + HRESULT hr; + + if (device->vertex_buffer_size < min_size || !device->vertex_buffer) + { + UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer *buffer; + + TRACE("Growing vertex buffer to %u bytes\n", size); + + hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, + WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); + if (FAILED(hr)) + { + ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + return hr; + } + + if (device->vertex_buffer) + wined3d_buffer_decref(device->vertex_buffer); + + device->vertex_buffer = buffer; + device->vertex_buffer_size = size; + device->vertex_buffer_pos = 0; + } + return D3D_OK; +} + static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, D3DPRIMITIVETYPE primitive_type, UINT primitive_count, const void *data, UINT stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; + UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + UINT size = vtx_count * stride; + 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); + if (!primitive_count) + { + WARN("primitive_count is 0, returning D3D_OK\n"); + return D3D_OK; + } + wined3d_mutex_lock(); + + hr = d3d9_device_prepare_vertex_buffer(device, size); + if (FAILED(hr)) + goto done; + + vb_pos = device->vertex_buffer_pos; + align = vb_pos % stride; + if (align) align = stride - align; + if (vb_pos + size + align > device->vertex_buffer_size) + vb_pos = 0; + 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)) + goto done; + memcpy(buffer_data, data, size); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_primitive_up(device->wined3d_device, - vertex_count_from_primitive_count(primitive_type, primitive_count), - data, stride); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); +done: + wined3d_mutex_unlock(); return hr; } @@ -2907,6 +2990,14 @@ static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, } wined3d_mutex_lock(); + + if (device->vertex_buffer) + { + wined3d_buffer_decref(device->vertex_buffer); + device->vertex_buffer = NULL; + device->vertex_buffer_size = 0; + } + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE);

1 0

Stefan Dösinger : d3d9: Use dynamic buffers for DrawIndexedPrimitiveUP.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: f3f172ce81ea17679854441674d55ffc8493a766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f172ce81ea1767985444167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:15 2012 +0100 d3d9: Use dynamic buffers for DrawIndexedPrimitiveUP. --- dlls/d3d9/d3d9_private.h | 3 + dlls/d3d9/device.c | 125 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 866078c..26d990a 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -153,6 +153,9 @@ struct d3d9_device struct wined3d_buffer *vertex_buffer; UINT vertex_buffer_size; UINT vertex_buffer_pos; + struct wined3d_buffer *index_buffer; + UINT index_buffer_size; + UINT index_buffer_pos; BOOL in_destruction; BOOL not_reset; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32f12d3..d79ad62 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -299,6 +299,8 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if if (device->vertex_buffer) wined3d_buffer_decref(device->vertex_buffer); + if (device->index_buffer) + wined3d_buffer_decref(device->index_buffer); wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); @@ -591,6 +593,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) + { + wined3d_buffer_decref(device->index_buffer); + device->index_buffer = NULL; + device->index_buffer_size = 0; + } wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, @@ -2063,26 +2071,123 @@ done: return hr; } +/* The caller is responsible for wined3d locking */ +static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT min_size) +{ + HRESULT hr; + + if (device->index_buffer_size < min_size || !device->index_buffer) + { + UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer *buffer; + + TRACE("Growing index buffer to %u bytes\n", size); + + hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, + WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); + if (FAILED(hr)) + { + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + return hr; + } + + if (device->index_buffer) + wined3d_buffer_decref(device->index_buffer); + + device->index_buffer = buffer; + device->index_buffer_size = size; + device->index_buffer_pos = 0; + } + return D3D_OK; +} + static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *iface, - D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT index_count, + D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT vertex_count, UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(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; + UINT ib_pos; + + UINT vtx_size = vertex_count * vertex_stride; + UINT vb_pos, align; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, index_count %u, primitive_count %u,\n" + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", - iface, primitive_type, min_vertex_idx, index_count, primitive_count, + iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); + if (!primitive_count) + { + WARN("primitive_count is 0, returning D3D_OK\n"); + return D3D_OK; + } + wined3d_mutex_lock(); + + hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); + if (FAILED(hr)) + goto done; + + vb_pos = device->vertex_buffer_pos; + align = vb_pos % vertex_stride; + if (align) align = vertex_stride - align; + if (vb_pos + vtx_size + align > device->vertex_buffer_size) + vb_pos = 0; + 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)) + goto done; + memcpy(buffer_data, vertex_data, vtx_size); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + vtx_size; + + hr = d3d9_device_prepare_index_buffer(device, idx_size); + if (FAILED(hr)) + goto done; + + ib_pos = device->index_buffer_pos; + align = ib_pos % idx_fmt_size; + if (align) align = idx_fmt_size - align; + if (ib_pos + idx_size + align > device->index_buffer_size) + ib_pos = 0; + 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)) + goto done; + memcpy(buffer_data, index_data, idx_size); + wined3d_buffer_unmap(device->index_buffer); + device->index_buffer_pos = ib_pos + idx_size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + if (FAILED(hr)) + goto done; + + wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_indexed_primitive_up(device->wined3d_device, - vertex_count_from_primitive_count(primitive_type, primitive_count), index_data, - wined3dformat_from_d3dformat(index_format), vertex_data, vertex_stride); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + + wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN); + wined3d_device_set_base_vertex_index(device->wined3d_device, 0); +done: + wined3d_mutex_unlock(); return hr; } @@ -2997,6 +3102,12 @@ static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) + { + wined3d_buffer_decref(device->index_buffer); + device->index_buffer = NULL; + device->index_buffer_size = 0; + } wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc,

1 0

Jacek Caban : atl100: Added AtlWinModuleInit tests.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: c38d5ce73c7cb4d89346bcef3793669d5594e4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38d5ce73c7cb4d89346bcef3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 18 11:48:47 2012 +0100 atl100: Added AtlWinModuleInit tests. --- configure | 1 + configure.ac | 1 + dlls/atl100/tests/Makefile.in | 8 +++++ dlls/atl100/tests/atl.c | 63 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7b3b31d..e19bf2b 100755 --- a/configure +++ b/configure @@ -15356,6 +15356,7 @@ wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 implib +wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib diff --git a/configure.ac b/configure.ac index 3a07cbf..0036376 100644 --- a/configure.ac +++ b/configure.ac @@ -2535,6 +2535,7 @@ WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[implib]) +WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in new file mode 100644 index 0000000..4230bad --- /dev/null +++ b/dlls/atl100/tests/Makefile.in @@ -0,0 +1,8 @@ +TESTDLL = atl100.dll +IMPORTS = ole32 atl100 +EXTRADEFS = -D_ATL_VER=_ATL_VER_100 + +C_SRCS = \ + atl.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c new file mode 100644 index 0000000..43d9bd5 --- /dev/null +++ b/dlls/atl100/tests/atl.c @@ -0,0 +1,63 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <atlbase.h> + +#include <wine/test.h> + +static void test_winmodule(void) +{ + _ATL_WIN_MODULE winmod; + HRESULT hres; + + winmod.cbSize = 0xdeadbeef; + hres = AtlWinModuleInit(&winmod); + ok(hres == E_INVALIDARG, "AtlWinModuleInit failed: %08x\n", hres); + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + winmod.m_csWindowCreate.LockCount = 0xdeadbeef; + winmod.m_rgWindowClassAtoms.m_aT = (void*)0xdeadbeef; + winmod.m_rgWindowClassAtoms.m_nSize = 0xdeadbeef; + winmod.m_rgWindowClassAtoms.m_nAllocSize = 0xdeadbeef; + hres = AtlWinModuleInit(&winmod); + ok(hres == S_OK, "AtlWinModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + ok(winmod.m_csWindowCreate.LockCount == -1, "winmod.m_csWindowCreate.LockCount = %d\n", + winmod.m_csWindowCreate.LockCount); + ok(winmod.m_rgWindowClassAtoms.m_aT == (void*)0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_aT = %p\n", + winmod.m_rgWindowClassAtoms.m_aT); + ok(winmod.m_rgWindowClassAtoms.m_nSize == 0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_nSize = %d\n", + winmod.m_rgWindowClassAtoms.m_nSize); + ok(winmod.m_rgWindowClassAtoms.m_nAllocSize == 0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_nAllocSize = %d\n", + winmod.m_rgWindowClassAtoms.m_nAllocSize); +} + +START_TEST(atl) +{ + CoInitialize(NULL); + + test_winmodule(); + + CoUninitialize(); +}

1 0

Jacek Caban : atl100: Added AtlWinModuleInit implementation.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: a650ce110485f77e22aad235b8274989acd0e77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a650ce110485f77e22aad235b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 18 11:48:37 2012 +0100 atl100: Added AtlWinModuleInit implementation. --- dlls/atl100/atl.c | 15 +++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index c0bc2ae..bd3fbf1 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -288,6 +288,21 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } /*********************************************************************** + * AtlWinModuleInit [atl100.65] + */ +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *winmod) +{ + TRACE("(%p\n", winmod); + + if(winmod->cbSize != sizeof(*winmod)) + return E_INVALIDARG; + + InitializeCriticalSection(&winmod->m_csWindowCreate); + winmod->m_pCreateWndList = NULL; + return S_OK; +} + +/*********************************************************************** * AtlWinModuleAddCreateWndData [atl100.43] */ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData *pData, void *pvObject) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 6c959d6..11cac7d 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -46,7 +46,7 @@ 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) -65 stub AtlWinModuleInit +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration 68 stub AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 6c29ad9..95b1f2a 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -221,6 +221,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*);

1 0

Piotr Caban : msvcrt: Use CompareString in wcscoll functions.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 1f784a100125a4511729b3dae110f3893c638c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f784a100125a4511729b3dae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:57:00 2012 +0100 msvcrt: Use CompareString in wcscoll functions. --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e7bf0e4..a0b1cb6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -74,8 +74,8 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - /* FIXME: handle collates */ - return strcmpiW( str1, str2 ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -83,8 +83,8 @@ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st */ INT CDECL MSVCRT__wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count ) { - /* FIXME: handle collates */ - return strncmpiW( str1, str2, count ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; } /********************************************************************* @@ -1010,8 +1010,8 @@ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, */ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - /* FIXME: handle collates */ - return strcmpW( str1, str2 ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + 0, str1, -1, str2, -1)-CSTR_EQUAL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Fixed locale matching code.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: a406d538bbeaab392e64d43088e8a2572818cff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a406d538bbeaab392e64d4308… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:39:00 2012 +0100 msvcrt: Fixed locale matching code. --- dlls/msvcrt/locale.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 707b8f1..4540e9a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -130,9 +130,12 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO { int len; + if(!cmp[0]) + return 0; + buff[0] = 0; GetLocaleInfoA(lcid, flags|LOCALE_NOUSEROVERRIDE, buff, MAX_ELEM_LEN); - if (!buff[0] || !cmp[0]) + if (!buff[0]) return 0; /* Partial matches are only allowed on language/country names */ @@ -175,7 +178,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO TRACE("Found country:%s->%s\n", res->search_country, buff); flags |= FOUND_COUNTRY; } - else if (res->match_flags & FOUND_COUNTRY) + else if (!flags && (res->match_flags & FOUND_COUNTRY)) { return CONTINUE_LOOKING; } @@ -188,7 +191,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO flags |= FOUND_CODEPAGE; memcpy(res->found_codepage,res->search_codepage,MAX_ELEM_LEN); } - else if (res->match_flags & FOUND_CODEPAGE) + else if (!flags && (res->match_flags & FOUND_CODEPAGE)) { return CONTINUE_LOOKING; }

1 0

Piotr Caban : msvcrt: Fixed codepage setting code in create_locale.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 7afc98a7f7af0dcafcb2c8624cbd56ef235eb78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afc98a7f7af0dcafcb2c8624… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:38:33 2012 +0100 msvcrt: Fixed codepage setting code in create_locale. --- dlls/msvcrt/locale.c | 76 +++++++++++++++++++++++++++++--------------------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 46 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7afc98a7f7af0dcafcb2c…

1 0

Piotr Caban : wined3d: Recognize Nvidia GT610 card.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: b71af96b9c3c9fa02edeaca3b90312b0bc539aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71af96b9c3c9fa02edeaca3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:38:19 2012 +0100 wined3d: Recognize Nvidia GT610 card. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 336c1e7..5d32345 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1093,6 +1093,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1499,6 +1500,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ + {"GT 610", CARD_NVIDIA_GEFORCE_GT610}, /* Geforce 600 - lowend */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77d3e03..dbff407 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1423,6 +1423,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GT610 = 0x104a, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1,

1 0