December 2012 - Wine-commits

Dmitry Timoshkov : winspool.drv: Correct the DocumentProperties spec entry.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 1cf52561c3dbe11e1fe440da19ba8e0b72a36856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf52561c3dbe11e1fe440da1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 16:57:03 2012 +0800 winspool.drv: Correct the DocumentProperties spec entry. --- dlls/winspool.drv/winspool.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index bdf346c..e83faec 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -99,8 +99,8 @@ @ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) @ stub DeviceMode @ stub DocumentEvent -@ stdcall DocumentPropertiesA(long long ptr ptr ptr long) -@ stdcall DocumentPropertiesW(long long ptr ptr ptr long) +@ stdcall DocumentPropertiesA(long long str ptr ptr long) +@ stdcall DocumentPropertiesW(long long wstr ptr ptr long) @ stub EXTDEVICEMODE @ stdcall EndDocPrinter(long) @ stdcall EndPagePrinter(long)

1 0

Dmitry Timoshkov : wineps.drv: Use device resolution specified at DC creation time.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 0cfc1c848f9eb9edbb226f5a093985f63096ae22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfc1c848f9eb9edbb226f5a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 16:57:44 2012 +0800 wineps.drv: Use device resolution specified at DC creation time. --- dlls/wineps.drv/init.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c63a6be..4df859e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -153,6 +153,19 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) PAGESIZE *page; INT width = 0, height = 0; + if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) + { + physDev->logPixelsX = physDev->Devmode->dmPublic.u1.s1.dmPrintQuality; + physDev->logPixelsY = physDev->logPixelsX; + } + else + { + physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; + physDev->logPixelsY = physDev->logPixelsX; + } + if (physDev->Devmode->dmPublic.dmFields & DM_YRESOLUTION) + physDev->logPixelsY = physDev->Devmode->dmPublic.dmYResolution; + if(physDev->Devmode->dmPublic.dmFields & DM_PAPERSIZE) { LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) { if(page->WinPage == physDev->Devmode->dmPublic.u1.s1.dmPaperSize)

1 0

Dmitry Timoshkov : wineps.drv: Return ASPECTX/ Y which represent current device resolution.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 671b977dd57ae4a803b76fdf34338b0691f00e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=671b977dd57ae4a803b76fdf3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 16:58:33 2012 +0800 wineps.drv: Return ASPECTX/Y which represent current device resolution. --- dlls/wineps.drv/init.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4df859e..98768a4 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -421,14 +421,13 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case RASTERCAPS: return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV | RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */ - /* Are aspect[XY] and logPixels[XY] correct? */ - /* Need to handle different res in x and y => fix ppd */ case ASPECTX: + return physDev->logPixelsX; case ASPECTY: - return physDev->pi->ppd->DefaultResolution; + return physDev->logPixelsY; case ASPECTXY: - return (int)hypot( (double)physDev->pi->ppd->DefaultResolution, - (double)physDev->pi->ppd->DefaultResolution ); + return (int)hypot( (double)physDev->logPixelsX, + (double)physDev->logPixelsY ); case LOGPIXELSX: return MulDiv(physDev->logPixelsX, physDev->Devmode->dmPublic.u1.s1.dmScale, 100);

1 0

Stefan Dösinger : ddraw: Pass the number of vertices to DrawIndexedPrimitive.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: ea40a3a8b558dc99d589b9e3b11006fa00ade2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea40a3a8b558dc99d589b9e3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 10:44:57 2012 +0100 ddraw: Pass the number of vertices to DrawIndexedPrimitive. --- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/executebuffer.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 85f6ca3..a0d7a4f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -494,7 +494,8 @@ struct d3d_execute_buffer /* This buffer will store the transformed vertices */ void *vertex_data; WORD *indices; - int nb_indices; + unsigned int nb_indices; + unsigned int nb_vertices; /* This flags is set to TRUE if we allocated ourselves the * data buffer diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 85625c1..f09460f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -133,7 +133,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += size; } IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, - D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, 0, buffer->indices, count * 3, 0); + D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, buffer->nb_vertices, + buffer->indices, count * 3, 0); } break; case D3DOP_MATRIXLOAD: @@ -711,6 +712,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * /* Prepares the transformed vertex buffer */ HeapFree(GetProcessHeap(), 0, buffer->vertex_data); buffer->vertex_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbvert * sizeof(D3DTLVERTEX)); + buffer->nb_vertices = nbvert; if (TRACE_ON(ddraw)) _dump_executedata(data);

1 0

Stefan Dösinger : ddraw: Move the index buffer growing code to a separate function.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 6deaa02fda1bfa505fd8a4040661067bf7fdf92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6deaa02fda1bfa505fd8a4040… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 10:44:58 2012 +0100 ddraw: Move the index buffer growing code to a separate function. --- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/device.c | 71 ++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a0d7a4f..83242cd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -275,9 +275,9 @@ struct d3d_device IUnknown *outer_unknown; struct wined3d_device *wined3d_device; struct ddraw *ddraw; - struct wined3d_buffer *indexbuffer; - UINT indexbuffer_size; - UINT indexbuffer_pos; + struct wined3d_buffer *index_buffer; + UINT index_buffer_size; + UINT index_buffer_pos; struct ddraw_surface *target; /* Viewport management */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 64a5d46..416eb68 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1998-2004 Lionel Ulmer * Copyright (c) 2002-2005 Christian Costa - * Copyright (c) 2006 Stefan Dösinger + * Copyright (c) 2006-2009, 2011-2012 Stefan Dösinger * Copyright (c) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or @@ -240,7 +240,8 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) * care of that on uninit_3d(). */ /* Free the index buffer. */ - if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); + if (This->index_buffer) + wined3d_buffer_decref(This->index_buffer); /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ @@ -3485,6 +3486,35 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface, * For details, see IWineD3DDevice::DrawIndexedPrimitiveUP * *****************************************************************************/ +/* The caller is responsible for wined3d locking */ +static HRESULT d3d_device_prepare_index_buffer(struct d3d_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, &ddraw_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 d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) @@ -4014,7 +4044,6 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPR PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, StartVertex, NumVertices, Flags); } - /***************************************************************************** * IDirect3DDevice7::DrawIndexedPrimitiveVB * @@ -4041,7 +4070,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; - UINT ib_pos = This->indexbuffer_pos; + UINT ib_pos; TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4057,36 +4086,22 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); - if (This->indexbuffer_size < IndexCount * sizeof(WORD)) + hr = d3d_device_prepare_index_buffer(This, IndexCount * sizeof(WORD)); + if (FAILED(hr)) { - UINT size = max(This->indexbuffer_size * 2, IndexCount * sizeof(WORD)); - struct wined3d_buffer *buffer; - - TRACE("Growing index buffer to %u bytes\n", size); - - hr = wined3d_buffer_create_ib(This->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) - { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", This, hr); - wined3d_mutex_unlock(); - return hr; - } - - if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); - This->indexbuffer = buffer; - This->indexbuffer_size = size; - ib_pos = 0; + wined3d_mutex_unlock(); + return hr; } + ib_pos = This->index_buffer_pos; - if (This->indexbuffer_size - IndexCount * sizeof(WORD) < ib_pos) + if (This->index_buffer_size - IndexCount * sizeof(WORD) < ib_pos) ib_pos = 0; /* Copy the index stream into the index buffer. A new IWineD3DDevice * 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(This->indexbuffer, ib_pos, IndexCount * sizeof(WORD), + hr = wined3d_buffer_map(This->index_buffer, ib_pos, IndexCount * sizeof(WORD), (BYTE **)&LockedIndices, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) { @@ -4095,12 +4110,12 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); - wined3d_buffer_unmap(This->indexbuffer); - This->indexbuffer_pos = ib_pos + IndexCount * sizeof(WORD); + wined3d_buffer_unmap(This->index_buffer); + This->index_buffer_pos = ib_pos + IndexCount * sizeof(WORD); /* Set the index stream */ wined3d_device_set_base_vertex_index(This->wined3d_device, StartVertex); - wined3d_device_set_index_buffer(This->wined3d_device, This->indexbuffer, WINED3DFMT_R16_UINT); + wined3d_device_set_index_buffer(This->wined3d_device, This->index_buffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ hr = wined3d_device_set_stream_source(This->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride);

1 0

Stefan Dösinger : ddraw: Handle DrawPrimitive with a dynamic vertex buffer.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 94388ed6c2445dcb26ffa8f1c003c9f2bc1bc210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94388ed6c2445dcb26ffa8f1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 10:44:59 2012 +0100 ddraw: Handle DrawPrimitive with a dynamic vertex buffer. --- dlls/ddraw/ddraw_private.h | 9 ++++- dlls/ddraw/device.c | 75 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 83242cd..ab190ef 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -275,10 +275,15 @@ struct d3d_device IUnknown *outer_unknown; struct wined3d_device *wined3d_device; struct ddraw *ddraw; + struct ddraw_surface *target; + struct wined3d_buffer *index_buffer; UINT index_buffer_size; UINT index_buffer_pos; - struct ddraw_surface *target; + + struct wined3d_buffer *vertex_buffer; + UINT vertex_buffer_size; + UINT vertex_buffer_pos; /* Viewport management */ struct list viewport_list; @@ -299,7 +304,7 @@ struct d3d_device DWORD vertex_type; DWORD render_flags; DWORD nb_vertices; - LPBYTE vertex_buffer; + LPBYTE sysmem_vertex_buffer; DWORD vertex_size; DWORD buffer_size; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 416eb68..fae7c7a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -239,9 +239,10 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) /* There is no need to unset any resources here, wined3d will take * care of that on uninit_3d(). */ - /* Free the index buffer. */ if (This->index_buffer) wined3d_buffer_decref(This->index_buffer); + if (This->vertex_buffer) + wined3d_buffer_decref(This->vertex_buffer); /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ @@ -2107,16 +2108,16 @@ static HRESULT WINAPI d3d_device3_Vertex(IDirect3DDevice3 *iface, void *vertex) BYTE *old_buffer; device->buffer_size = device->buffer_size ? device->buffer_size * 2 : device->vertex_size * 3; - old_buffer = device->vertex_buffer; - device->vertex_buffer = HeapAlloc(GetProcessHeap(), 0, device->buffer_size); + old_buffer = device->sysmem_vertex_buffer; + device->sysmem_vertex_buffer = HeapAlloc(GetProcessHeap(), 0, device->buffer_size); if (old_buffer) { - memcpy(device->vertex_buffer, old_buffer, device->nb_vertices * device->vertex_size); + memcpy(device->sysmem_vertex_buffer, old_buffer, device->nb_vertices * device->vertex_size); HeapFree(GetProcessHeap(), 0, old_buffer); } } - memcpy(device->vertex_buffer + device->nb_vertices++ * device->vertex_size, vertex, device->vertex_size); + memcpy(device->sysmem_vertex_buffer + device->nb_vertices++ * device->vertex_size, vertex, device->vertex_size); wined3d_mutex_unlock(); return D3D_OK; @@ -2185,7 +2186,7 @@ static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags) TRACE("iface %p, flags %#x.\n", iface, flags); return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, device->primitive_type, - device->vertex_type, device->vertex_buffer, device->nb_vertices, device->render_flags); + device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags); } static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags) @@ -3378,13 +3379,45 @@ static HRESULT WINAPI d3d_device2_MultiplyTransform(IDirect3DDevice2 *iface, * For details, see IWineD3DDevice::DrawPrimitiveUP * *****************************************************************************/ + +/* The caller is responsible for wined3d locking */ +static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_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, &ddraw_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 d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - UINT stride; + UINT stride, vb_pos, size; HRESULT hr; + BYTE *data; TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, flags); @@ -3394,13 +3427,37 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, /* Get the stride */ stride = get_flexible_vertex_size(fvf); + size = vertex_count * stride; wined3d_mutex_lock(); + hr = d3d_device_prepare_vertex_buffer(device, size); + if (FAILED(hr)) + goto done; + + /* TODO: Align the map position to the vertex size and use the draw start vertex + * parameter instead of the per-stream offset */ + vb_pos = device->vertex_buffer_pos; + if (device->vertex_buffer_size - size < vb_pos) + vb_pos = 0; + + hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &data, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + memcpy(data, vertices, 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, vb_pos, stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_primitive_up(device->wined3d_device, vertex_count, vertices, stride); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_primitive(device->wined3d_device, 0, vertex_count); +done: + wined3d_mutex_unlock(); return hr; }

1 0

Stefan Dösinger : ddraw: Handle DrawIndexedPrimitive via dynamic buffers.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 09d44a1967fc35cc23be0d74a7233e4f6f66b88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d44a1967fc35cc23be0d74a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 10:45:00 2012 +0100 ddraw: Handle DrawIndexedPrimitive via dynamic buffers. --- dlls/ddraw/device.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fae7c7a..d7b8bd2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3578,6 +3578,10 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; + UINT stride = get_flexible_vertex_size(fvf); + UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); + UINT vb_pos, ib_pos; + BYTE *data; TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, " "indices %p, index_count %u, flags %#x.\n", @@ -3585,12 +3589,51 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); + + hr = d3d_device_prepare_vertex_buffer(device, vtx_size); + if (FAILED(hr)) + goto done; + + /* TODO: Align the map position to the vertex size and use the draw start vertex + * parameter instead of the per-stream offset */ + vb_pos = device->vertex_buffer_pos; + if (device->vertex_buffer_size - vtx_size < vb_pos) + vb_pos = 0; + + hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &data, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + memcpy(data, vertices, vtx_size); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + vtx_size; + + hr = d3d_device_prepare_index_buffer(device, idx_size); + if (FAILED(hr)) + goto done; + ib_pos = device->index_buffer_pos; + if (device->index_buffer_size - idx_size < ib_pos) + ib_pos = 0; + + hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &data, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + memcpy(data, indices, 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, vb_pos, stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_indexed_primitive_up(device->wined3d_device, index_count, indices, - WINED3DFMT_R16_UINT, vertices, get_flexible_vertex_size(fvf)); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); +done: + wined3d_mutex_unlock(); return hr; }

1 0

Stefan Dösinger : ddraw: Align user vertex data.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 3b197749f94eda1f5bb2793d76d18477e32c5a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b197749f94eda1f5bb2793d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 10:45:01 2012 +0100 ddraw: Align user vertex data. --- dlls/ddraw/device.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d7b8bd2..601c96e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3415,7 +3415,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, DWORD vertex_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - UINT stride, vb_pos, size; + UINT stride, vb_pos, size, align; HRESULT hr; BYTE *data; @@ -3434,11 +3434,13 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, if (FAILED(hr)) goto done; - /* TODO: Align the map position to the vertex size and use the draw start vertex - * parameter instead of the per-stream offset */ vb_pos = device->vertex_buffer_pos; - if (device->vertex_buffer_size - size < vb_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, &data, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); @@ -3448,13 +3450,13 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, 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, vb_pos, stride); + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); - hr = wined3d_device_draw_primitive(device->wined3d_device, 0, vertex_count); + hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vertex_count); done: wined3d_mutex_unlock(); @@ -3580,7 +3582,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); - UINT vb_pos, ib_pos; + UINT vb_pos, ib_pos, align; BYTE *data; TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, " @@ -3594,11 +3596,13 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, if (FAILED(hr)) goto done; - /* TODO: Align the map position to the vertex size and use the draw start vertex - * parameter instead of the per-stream offset */ vb_pos = device->vertex_buffer_pos; - if (device->vertex_buffer_size - vtx_size < vb_pos) + align = vb_pos % stride; + if (align) align = 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, &data, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); @@ -3623,13 +3627,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, 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, vb_pos, stride); + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / stride); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); done: @@ -4010,6 +4015,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, /* WineD3D doesn't need the FVF here */ wined3d_mutex_lock(); wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); + wined3d_device_set_base_vertex_index(device->wined3d_device, 0); hr = wined3d_device_draw_indexed_primitive_strided(device->wined3d_device, IndexCount, &wined3d_strided, VertexCount, Indices, WINED3DFMT_R16_UINT); wined3d_mutex_unlock();

1 0

Jacek Caban : jscript: Moved string concatenation to helper function.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: f0c0c14241219c302385088977eecdd03064f793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c0c14241219c30238508897… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 18 11:16:24 2012 +0100 jscript: Moved string concatenation to helper function. --- dlls/jscript/engine.c | 15 +++------------ dlls/jscript/jsstr.c | 19 +++++++++++++++++++ dlls/jscript/jsstr.h | 1 + 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 489aef6..eb15be4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1447,22 +1447,13 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * hres = to_string(ctx, r, &rstr); if(SUCCEEDED(hres)) { - unsigned len1, len2; jsstr_t *ret_str; - len1 = jsstr_length(lstr); - len2 = jsstr_length(rstr); - - ret_str = jsstr_alloc_buf(len1+len2); - if(ret_str) { - if(len1) - memcpy(ret_str->str, lstr->str, len1*sizeof(WCHAR)); - if(len2) - memcpy(ret_str->str+len1, rstr->str, len2*sizeof(WCHAR)); + ret_str = jsstr_concat(lstr, rstr); + if(ret_str) *ret = jsval_string(ret_str); - }else { + else hres = E_OUTOFMEMORY; - } } jsstr_release(lstr); diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 3586dad..aad7af2 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -66,6 +66,25 @@ int jsstr_cmp(jsstr_t *str1, jsstr_t *str2) return ret; } +jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2) +{ + unsigned len1, len2; + jsstr_t *ret; + + len1 = jsstr_length(str1); + len2 = jsstr_length(str2); + + ret = jsstr_alloc_buf(len1+len2); + if(!ret) + return NULL; + + if(len1) + memcpy(ret->str, str1->str, len1*sizeof(WCHAR)); + if(len2) + memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR)); + return ret; +} + static jsstr_t *empty_str, *nan_str; jsstr_t *jsstr_nan(void) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index ca3b5d9..8ac7410 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -60,6 +60,7 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) } int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; +jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; jsstr_t *jsstr_nan(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Optimized concatenation of empty strings.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 0e6d3b8611d2158c79448aa05063b6a8ac7de410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6d3b8611d2158c79448aa05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 18 11:16:34 2012 +0100 jscript: Optimized concatenation of empty strings. --- dlls/jscript/jsstr.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index aad7af2..d34af0f 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -72,16 +72,19 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2) jsstr_t *ret; len1 = jsstr_length(str1); + if(!len1) + return jsstr_addref(str2); + len2 = jsstr_length(str2); + if(!len2) + return jsstr_addref(str1); ret = jsstr_alloc_buf(len1+len2); if(!ret) return NULL; - if(len1) - memcpy(ret->str, str1->str, len1*sizeof(WCHAR)); - if(len2) - memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR)); + memcpy(ret->str, str1->str, len1*sizeof(WCHAR)); + memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR)); return ret; }

1 0