June 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DVertexBuffer7 iface .
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: d7768739ecd9ba7d77e5cea9d6e46c3e65d2323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7768739ecd9ba7d77e5cea9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:48:18 2011 +0200 ddraw: COM cleanup for the IDirect3DVertexBuffer7 iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/device.c | 5 ++- dlls/ddraw/vertexbuffer.c | 77 ++++++++++++++++++++----------------------- 4 files changed, 41 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7768739ecd9ba7d77e5c…

1 0

Alexandre Julliard : rpcrt4: Make more of the stubless proxy setup code platform-independent.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 779a8fcddb04f19225e162aff915f8adf024f6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779a8fcddb04f19225e162aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 12:26:03 2011 +0200 rpcrt4: Make more of the stubless proxy setup code platform-independent. --- dlls/rpcrt4/cproxy.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6a73953..96dc0b5 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -69,7 +69,7 @@ static inline StdProxyImpl *impl_from_proxy_obj( void *iface ) return CONTAINING_RECORD(iface, StdProxyImpl, PVtbl); } -#if defined(__i386__) +#ifdef __i386__ #include "pshpack1.h" @@ -112,6 +112,30 @@ LONG_PTR WINAPI ObjectStubless(void **args) return ndr_client_call(stubless->pStubDesc, fs, args + 2); } +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->mov_eax = 0xb8; /* movl $n,%eax */ + thunk->index = index; + thunk->jmp = 0xe9; /* jmp */ + thunk->handler = (char *)call_stubless_func - (char *)(&thunk->handler + 1); +} + +#else /* __i386__ */ + +#warning You must implement stubless proxies for your CPU + +struct thunk +{ + DWORD index; +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->index = index; +} + +#endif /* __i386__ */ + #define BLOCK_SIZE 1024 #define MAX_BLOCKS 64 /* 64k methods should be enough for anybody */ @@ -126,13 +150,7 @@ static const struct thunk *allocate_block( unsigned int num ) MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); if (!block) return NULL; - for (i = 0; i < BLOCK_SIZE; i++) - { - block[i].mov_eax = 0xb8; /* movl $n,%eax */ - block[i].index = BLOCK_SIZE * num + i + 3; - block[i].jmp = 0xe9; /* jmp */ - block[i].handler = (char *)call_stubless_func - (char *)(&block[i].handler + 1); - } + for (i = 0; i < BLOCK_SIZE; i++) init_thunk( &block[i], BLOCK_SIZE * num + i + 3 ); VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); if (prev) /* someone beat us to it */ @@ -163,16 +181,6 @@ static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) return TRUE; } -#else /* __i386__ */ - -static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) -{ - ERR("stubless proxies are not supported on this architecture\n"); - return FALSE; -} - -#endif /* __i386__ */ - HRESULT StdProxy_Construct(REFIID riid, LPUNKNOWN pUnkOuter, const ProxyFileInfo *ProxyInfo,

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DVertexBuffer iface.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 60223057f040e315b638a9562b08b0354195a197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60223057f040e315b638a9562… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:46:31 2011 +0200 ddraw: COM cleanup for the IDirect3DVertexBuffer iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 10 ++-------- dlls/ddraw/vertexbuffer.c | 41 ++++++++++++++++++++++++++++++----------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4fbabf3..b322414 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4983,7 +4983,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER if (hr == D3D_OK) { TRACE("Created vertex buffer %p.\n", object); - *vertex_buffer = (IDirect3DVertexBuffer *)object; + *vertex_buffer = &object->IDirect3DVertexBuffer_iface; } else WARN("Failed to create vertex buffer, hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c130b6f..fec0150 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -521,8 +521,8 @@ struct IDirect3DVertexBufferImpl { /*** IUnknown Methods ***/ const IDirect3DVertexBuffer7Vtbl *lpVtbl; - const IDirect3DVertexBufferVtbl *IDirect3DVertexBuffer_vtbl; - LONG ref; + IDirect3DVertexBuffer IDirect3DVertexBuffer_iface; + LONG ref; /*** WineD3D and ddraw links ***/ struct wined3d_buffer *wineD3DVertexBuffer; @@ -539,12 +539,6 @@ HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirect IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) DECLSPEC_HIDDEN; IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface) DECLSPEC_HIDDEN; -static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface) -{ - return (IDirect3DVertexBufferImpl *)((char*)iface - - FIELD_OFFSET(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer_vtbl)); -} - /***************************************************************************** * Helper functions from utils.c *****************************************************************************/ diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 0442b85..46bf83c 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static inline IDirect3DVertexBufferImpl *impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexBufferImpl, IDirect3DVertexBuffer_iface); +} + /***************************************************************************** * IUnknown Methods *****************************************************************************/ @@ -67,7 +72,7 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface, if ( IsEqualGUID( &IID_IDirect3DVertexBuffer, riid ) ) { IUnknown_AddRef(iface); - *obj = &This->IDirect3DVertexBuffer_vtbl; + *obj = &This->IDirect3DVertexBuffer_iface; TRACE(" Creating IDirect3DVertexBuffer interface %p\n", *obj); return S_OK; } @@ -85,9 +90,11 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface, static HRESULT WINAPI IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface, REFIID riid, void **obj) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - return IDirect3DVertexBuffer7_QueryInterface((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), riid, obj); + return IDirect3DVertexBuffer7_QueryInterface((IDirect3DVertexBuffer7 *)This, riid, obj); } /***************************************************************************** @@ -112,9 +119,11 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface) static ULONG WINAPI IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p.\n", iface); - return IDirect3DVertexBuffer7_AddRef((IDirect3DVertexBuffer7 *)vb_from_vb1(iface)); + return IDirect3DVertexBuffer7_AddRef((IDirect3DVertexBuffer7 *)This); } @@ -164,9 +173,11 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) static ULONG WINAPI IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p.\n", iface); - return IDirect3DVertexBuffer7_Release((IDirect3DVertexBuffer7 *)vb_from_vb1(iface)); + return IDirect3DVertexBuffer7_Release((IDirect3DVertexBuffer7 *)This); } /***************************************************************************** @@ -231,9 +242,11 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, DWORD Flags, void **Data, DWORD *Size) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size); - return IDirect3DVertexBuffer7_Lock((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), Flags, Data, Size); + return IDirect3DVertexBuffer7_Lock((IDirect3DVertexBuffer7 *)This, Flags, Data, Size); } /***************************************************************************** @@ -261,9 +274,11 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p.\n", iface); - return IDirect3DVertexBuffer7_Unlock((IDirect3DVertexBuffer7 *)vb_from_vb1(iface)); + return IDirect3DVertexBuffer7_Unlock((IDirect3DVertexBuffer7 *)This); } @@ -341,13 +356,14 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVerte DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer, DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer(SrcBuffer); IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags); - return IDirect3DVertexBuffer7_ProcessVertices((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), VertexOp, + return IDirect3DVertexBuffer7_ProcessVertices((IDirect3DVertexBuffer7 *)This, VertexOp, DestIndex, Count, (IDirect3DVertexBuffer7 *)Src, SrcIndex, (IDirect3DDevice7 *)D3D, Flags); } @@ -392,9 +408,11 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, static HRESULT WINAPI IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface, D3DVERTEXBUFFERDESC *Desc) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); + TRACE("iface %p, desc %p.\n", iface, Desc); - return IDirect3DVertexBuffer7_GetVertexBufferDesc((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), Desc); + return IDirect3DVertexBuffer7_GetVertexBufferDesc((IDirect3DVertexBuffer7 *)This, Desc); } @@ -440,11 +458,12 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, IDirect3DDevice3 *D3DDevice, DWORD Flags) { + IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; TRACE("iface %p, device %p, flags %#x.\n", iface, D3DDevice, Flags); - return IDirect3DVertexBuffer7_Optimize((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), + return IDirect3DVertexBuffer7_Optimize((IDirect3DVertexBuffer7 *)This, (IDirect3DDevice7 *)D3D, Flags); } @@ -538,7 +557,7 @@ HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirect return DDERR_OUTOFMEMORY; buffer->lpVtbl = &d3d_vertex_buffer7_vtbl; - buffer->IDirect3DVertexBuffer_vtbl = &d3d_vertex_buffer1_vtbl; + buffer->IDirect3DVertexBuffer_iface.lpVtbl = &d3d_vertex_buffer1_vtbl; buffer->ref = 1; buffer->ddraw = ddraw; @@ -588,7 +607,7 @@ IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVerte return NULL; assert(iface->lpVtbl == &d3d_vertex_buffer1_vtbl); - return vb_from_vb1(iface); + return impl_from_IDirect3DVertexBuffer(iface); } IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface)

1 0

Michael Stefaniuc : ddraw: Use unsafe_impl_from_IDirect3DVertexBuffer() for app provided ifaces.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 8e272741635104cfd1aa4f699d4d3ca57137bbaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e272741635104cfd1aa4f699… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:40:44 2011 +0200 ddraw: Use unsafe_impl_from_IDirect3DVertexBuffer() for app provided ifaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 10 +++++----- dlls/ddraw/vertexbuffer.c | 34 +++++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 05a6e27..c130b6f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -536,6 +536,8 @@ struct IDirect3DVertexBufferImpl HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirectDrawImpl *ddraw, D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; +IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) DECLSPEC_HIDDEN; +IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface) DECLSPEC_HIDDEN; static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9fb5b69..fa6d362 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4053,7 +4053,7 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface, DWORD Flags) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; - IDirect3DVertexBufferImpl *vb = (IDirect3DVertexBufferImpl *)D3DVertexBuf; + IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); HRESULT hr; DWORD stride; @@ -4126,7 +4126,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveVB(IDirect3DDevice3 *if D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags) { - IDirect3DVertexBufferImpl *vb = D3DVertexBuf ? vb_from_vb1(D3DVertexBuf) : NULL; + IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer(D3DVertexBuf); TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); @@ -4164,7 +4164,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD Flags) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; - IDirect3DVertexBufferImpl *vb = (IDirect3DVertexBufferImpl *)D3DVertexBuf; + IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); DWORD stride = get_flexible_vertex_size(vb->fvf); struct wined3d_resource *wined3d_resource; struct wined3d_resource_desc desc; @@ -4288,13 +4288,13 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevi D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, WORD *Indices, DWORD IndexCount, DWORD Flags) { - IDirect3DVertexBufferImpl *VB = vb_from_vb1(D3DVertexBuf); + IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer(D3DVertexBuf); TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); return IDirect3DDevice7_DrawIndexedPrimitiveVB((IDirect3DDevice7 *)device_from_device3(iface), - PrimitiveType, (IDirect3DVertexBuffer7 *)VB, 0, IndexCount, Indices, IndexCount, Flags); + PrimitiveType, (IDirect3DVertexBuffer7 *)vb, 0, IndexCount, Indices, IndexCount, Flags); } /***************************************************************************** diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index e0e0a09..0442b85 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -289,18 +289,12 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer * * DDERR_INVALIDPARAMS If D3DVOP_TRANSFORM wasn't passed * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, - DWORD VertexOp, - DWORD DestIndex, - DWORD Count, - IDirect3DVertexBuffer7 *SrcBuffer, - DWORD SrcIndex, - IDirect3DDevice7 *D3DDevice, - DWORD Flags) +static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, + DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer7 *SrcBuffer, + DWORD SrcIndex, IDirect3DDevice7 *D3DDevice, DWORD Flags) { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; - IDirect3DVertexBufferImpl *Src = (IDirect3DVertexBufferImpl *)SrcBuffer; + IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer7(SrcBuffer); IDirect3DDeviceImpl *D3D = (IDirect3DDeviceImpl *)D3DDevice; BOOL oldClip, doClip; HRESULT hr; @@ -347,7 +341,7 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVerte DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer, DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags) { - IDirect3DVertexBufferImpl *Src = SrcBuffer ? vb_from_vb1(SrcBuffer) : NULL; + IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer(SrcBuffer); IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", @@ -587,3 +581,21 @@ end: return hr; } + +IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d_vertex_buffer1_vtbl); + + return vb_from_vb1(iface); +} + +IDirect3DVertexBufferImpl *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d_vertex_buffer7_vtbl); + + return (IDirect3DVertexBufferImpl *)iface; +}

1 0

Michael Stefaniuc : ddraw: Avoid unsafe IDirect3DVertexBuffer to object casts.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: ca1ee4a7c353ff911326b001c228ea867e375a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1ee4a7c353ff911326b001c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:38:47 2011 +0200 ddraw: Avoid unsafe IDirect3DVertexBuffer to object casts. --- dlls/ddraw/ddraw.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0faaecc..4fbabf3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4968,17 +4968,25 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER IDirect3DVertexBuffer **vertex_buffer, DWORD flags, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirect3D3(iface); + IDirect3DVertexBufferImpl *object; HRESULT hr; TRACE("iface %p, desc %p, vertex_buffer %p, flags %#x, outer_unknown %p.\n", iface, desc, vertex_buffer, flags, outer_unknown); - if (outer_unknown) return CLASS_E_NOAGGREGATION; + if (outer_unknown) + return CLASS_E_NOAGGREGATION; + if (!vertex_buffer || !desc) + return DDERR_INVALIDPARAMS; - hr = d3d7_CreateVertexBuffer(&This->IDirect3D7_iface, desc, - (IDirect3DVertexBuffer7 **)vertex_buffer, flags); - if (*vertex_buffer) - *vertex_buffer = (IDirect3DVertexBuffer *)&((IDirect3DVertexBufferImpl *)*vertex_buffer)->IDirect3DVertexBuffer_vtbl; + hr = d3d_vertex_buffer_create(&object, This, desc); + if (hr == D3D_OK) + { + TRACE("Created vertex buffer %p.\n", object); + *vertex_buffer = (IDirect3DVertexBuffer *)object; + } + else + WARN("Failed to create vertex buffer, hr %#x.\n", hr); return hr; }

1 0

Michael Stefaniuc : ddraw: Rename d3d_vertex_buffer_init() and have it allocate the object too.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: d010dac84d9b03b3f9f5f7aced7b3bbef0209b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d010dac84d9b03b3f9f5f7ace… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:36:49 2011 +0200 ddraw: Rename d3d_vertex_buffer_init() and have it allocate the object too. --- dlls/ddraw/ddraw.c | 30 +++++++----------------------- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/vertexbuffer.c | 36 ++++++++++++++++++++++++------------ 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2233e25..0faaecc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4952,32 +4952,16 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER if (!vertex_buffer || !desc) return DDERR_INVALIDPARAMS; - TRACE("Vertex buffer description:\n"); - TRACE(" dwSize %u\n", desc->dwSize); - TRACE(" dwCaps %#x\n", desc->dwCaps); - TRACE(" FVF %#x\n", desc->dwFVF); - TRACE(" dwNumVertices %u\n", desc->dwNumVertices); - - /* Now create the vertex buffer */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate vertex buffer memory.\n"); - return DDERR_OUTOFMEMORY; - } - - hr = d3d_vertex_buffer_init(object, This, desc); - if (FAILED(hr)) + hr = d3d_vertex_buffer_create(&object, This, desc); + if (hr == D3D_OK) { - WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; + TRACE("Created vertex buffer %p.\n", object); + *vertex_buffer = (IDirect3DVertexBuffer7 *)object; } + else + WARN("Failed to create vertex buffer, hr %#x.\n", hr); - TRACE("Created vertex buffer %p.\n", object); - *vertex_buffer = (IDirect3DVertexBuffer7 *)object; - - return D3D_OK; + return hr; } static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFERDESC *desc, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 42c1f13..05a6e27 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -534,8 +534,8 @@ struct IDirect3DVertexBufferImpl DWORD fvf; }; -HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, - IDirectDrawImpl *ddraw, D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirectDrawImpl *ddraw, + D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface) { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index af4e8bc..e0e0a09 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -526,11 +526,22 @@ static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl = IDirect3DVertexBufferImpl_1_Optimize }; -HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, - IDirectDrawImpl *ddraw, D3DVERTEXBUFFERDESC *desc) +HRESULT d3d_vertex_buffer_create(IDirect3DVertexBufferImpl **vertex_buf, IDirectDrawImpl *ddraw, + D3DVERTEXBUFFERDESC *desc) { + IDirect3DVertexBufferImpl *buffer; DWORD usage; - HRESULT hr; + HRESULT hr = D3D_OK; + + TRACE("Vertex buffer description:\n"); + TRACE(" dwSize %u\n", desc->dwSize); + TRACE(" dwCaps %#x\n", desc->dwCaps); + TRACE(" FVF %#x\n", desc->dwFVF); + TRACE(" dwNumVertices %u\n", desc->dwNumVertices); + + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*buffer)); + if (!buffer) + return DDERR_OUTOFMEMORY; buffer->lpVtbl = &d3d_vertex_buffer7_vtbl; buffer->IDirect3DVertexBuffer_vtbl = &d3d_vertex_buffer1_vtbl; @@ -552,12 +563,9 @@ HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, if (FAILED(hr)) { WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr); - LeaveCriticalSection(&ddraw_cs); - if (hr == WINED3DERR_INVALIDCALL) - return DDERR_INVALIDPARAMS; - else - return hr; + hr = DDERR_INVALIDPARAMS; + goto end; } buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); @@ -565,13 +573,17 @@ HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); wined3d_buffer_decref(buffer->wineD3DVertexBuffer); - LeaveCriticalSection(&ddraw_cs); - - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto end; } wined3d_vertex_declaration_incref(buffer->wineD3DVertexDeclaration); +end: LeaveCriticalSection(&ddraw_cs); + if (hr == D3D_OK) + *vertex_buf = buffer; + else + HeapFree(GetProcessHeap(), 0, buffer); - return D3D_OK; + return hr; }

1 0

Alexandre Julliard : rpcrt4: Implement stubless proxy entry thunks for x86_64.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: b02457a108ce1365ec48dce13088c5747fea99c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02457a108ce1365ec48dce13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 12:49:24 2011 +0200 rpcrt4: Implement stubless proxy entry thunks for x86_64. --- dlls/rpcrt4/cproxy.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index ed7faf7..b5be7ae 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -116,6 +116,53 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) thunk->handler = (char *)call_stubless_func - (char *)(&thunk->handler + 1); } +#elif defined(__x86_64__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC(call_stubless_func, + "movq %rcx,0x8(%rsp)\n\t" + "movq %rdx,0x10(%rsp)\n\t" + "movq %r8,0x18(%rsp)\n\t" + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x8(%rsp),%r8\n\t" /* &This */ + "movq (%rcx),%rcx\n\t" /* This->lpVtbl */ + "movq -0x10(%rcx),%rcx\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "movq 0x10(%rcx),%rdx\n\t" /* info->FormatStringOffset */ + "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ + "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ + "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ + "subq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#include "pshpack1.h" +struct thunk +{ + BYTE mov_r10[3]; + DWORD index; + BYTE mov_rax[2]; + void *call_stubless; + BYTE jmp_rax[2]; +}; +#include "poppack.h" + +static const struct thunk thunk_template = +{ + { 0x49, 0xc7, 0xc2 }, 0, /* movq $index,%r10 */ + { 0x48, 0xb8 }, 0, /* movq $call_stubless_func,%rax */ + { 0xff, 0xe0 } /* jmp *%rax */ +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + *thunk = thunk_template; + thunk->index = index; + thunk->call_stubless = call_stubless_func; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU

1 0

Alexandre Julliard : rpcrt4: Reimplement the stubless proxy entry point entirely in assembly.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 915a0769e5dd07a30997ba47bbe447f4a3f98676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915a0769e5dd07a30997ba47b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 12:26:35 2011 +0200 rpcrt4: Reimplement the stubless proxy entry point entirely in assembly. --- dlls/rpcrt4/cproxy.c | 56 +++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 96dc0b5..ed7faf7 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -71,46 +71,42 @@ static inline StdProxyImpl *impl_from_proxy_obj( void *iface ) #ifdef __i386__ -#include "pshpack1.h" - -struct thunk { - BYTE mov_eax; - DWORD index; - BYTE jmp; - LONG handler; -}; - -#include "poppack.h" - extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, - "pushl %eax\n\t" /* method index */ + "movl 4(%esp),%ecx\n\t" /* This pointer */ + "movl (%ecx),%ecx\n\t" /* This->lpVtbl */ + "movl -8(%ecx),%ecx\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "movl 8(%ecx),%edx\n\t" /* info->FormatStringOffset */ + "movzwl (%edx,%eax,2),%edx\n\t" /* FormatStringOffset[index] */ + "addl 4(%ecx),%edx\n\t" /* info->ProcFormatString + offset */ + "movzwl 8(%edx),%eax\n\t" /* arguments size */ + "pushl %eax\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl %esp\n\t" /* pointer to index */ + "leal 8(%esp),%eax\n\t" /* &This */ + "pushl %eax\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "call " __ASM_NAME("ObjectStubless") __ASM_STDCALL(4) "\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") - "popl %edx\n\t" /* args size */ + "pushl %edx\n\t" /* format string */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "pushl (%ecx)\n\t" /* info->pStubDesc */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "call " __ASM_NAME("ndr_client_call") "\n\t" + "leal 12(%esp),%esp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -12\n\t") + "popl %edx\n\t" /* arguments size */ __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "movl (%esp),%ecx\n\t" /* return address */ "addl %edx,%esp\n\t" "jmp *%ecx" ); -LONG_PTR WINAPI ObjectStubless(void **args) +#include "pshpack1.h" +struct thunk { - DWORD index = (DWORD)args[0]; - void **iface = (void **)args[2]; - const void **vtbl = (const void **)*iface; - const MIDL_STUBLESS_PROXY_INFO *stubless = *(const MIDL_STUBLESS_PROXY_INFO **)(vtbl - 2); - const PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[index]; - DWORD arg_size = *(const WORD*)(fs + 8); - - /* store bytes to remove from stack */ - args[0] = (void *)arg_size; - TRACE("(%p)->(%d)([%d bytes]) ret=%p\n", iface, index, arg_size, args[1]); - - return ndr_client_call(stubless->pStubDesc, fs, args + 2); -} + BYTE mov_eax; + DWORD index; + BYTE jmp; + LONG handler; +}; +#include "poppack.h" static inline void init_thunk( struct thunk *thunk, unsigned int index ) {

1 0

Francois Gouget : Standardize the OK buttons.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: df63b636144db55ad839624ebbe918ae46f6a959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df63b636144db55ad839624eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 15 11:32:33 2011 +0200 Standardize the OK buttons. --- dlls/appwiz.cpl/It.rc | 2 +- dlls/comdlg32/cdlg_Da.rc | 4 ++-- dlls/comdlg32/cdlg_De.rc | 4 ++-- dlls/comdlg32/cdlg_Fi.rc | 2 +- dlls/comdlg32/cdlg_Hu.rc | 4 ++-- dlls/comdlg32/cdlg_It.rc | 4 ++-- dlls/comdlg32/cdlg_Sv.rc | 12 ++++++------ dlls/user32/resources/user32_Cs.rc | 2 +- dlls/user32/resources/user32_Fr.rc | 2 +- dlls/user32/resources/user32_It.rc | 2 +- dlls/user32/resources/user32_Sk.rc | 2 +- dlls/user32/tests/resource.rc | 10 +++++----- dlls/wininet/wininet_It.rc | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df63b636144db55ad8396…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 658834847e01f8c23f5ae257223b04327623ea3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=658834847e01f8c23f5ae2572… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 15 11:48:14 2011 +0900 po: Update Korean translation. --- po/ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index a406dfd..c622c27 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8364,11 +8364,11 @@ msgstr "이 출력 줄은 너무 깁니다.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "다이렉트엑스 진단 도구" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "사용법: dxdiag [/whql:off | /whql:on] [/t 파일이름 | /x 파일이름]" #: hostname.rc:27 msgid "Usage: hostname\n"

1 0