December 2006 - Wine-Commits

Rob Shearman : ole32: Reset the message filter at the end of the message filter test.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 4fa03831a5220168bc12d9285472baf3070fe811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa03831a5220168bc12d9285… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:37:29 2006 +0000 ole32: Reset the message filter at the end of the message filter test. --- dlls/ole32/tests/marshal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index aa71790..f573a47 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1296,7 +1296,6 @@ static void test_message_filter(void) hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); ok_ole_success(hr, CoRegisterMessageFilter); - if (prev_filter) IMessageFilter_Release(prev_filter); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); ok_ole_success(hr, IClassFactory_CreateInstance); @@ -1308,6 +1307,9 @@ static void test_message_filter(void) ok_no_locks(); end_host_object(tid, thread); + + hr = CoRegisterMessageFilter(prev_filter, NULL); + ok_ole_success(hr, CoRegisterMessageFilter); } /* test failure case of trying to unmarshal from bad stream */

1 0

Rob Shearman : ole32: Pass in the IID and IUnknown* of the object being executed to the server notification and message filter functions .
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: a089e57983cdc439bb6c10d4356bb3a6276b9d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a089e57983cdc439bb6c10d43… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:37:15 2006 +0000 ole32: Pass in the IID and IUnknown* of the object being executed to the server notification and message filter functions. --- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/rpc.c | 16 ++++++++++------ dlls/ole32/stubmanager.c | 9 ++++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 5c8f577..aee19f2 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -200,7 +200,7 @@ BOOL stub_manager_notify_unmarshal(struc BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid); HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stubmgr_ret); -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan); +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface); HRESULT start_apartment_remote_unknown(void); HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, MSHLFLAGS mshlflags); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5d66891..586562e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -118,6 +118,8 @@ struct dispatch_params RPCOLEMESSAGE *msg; /* message */ IRpcStubBuffer *stub; /* stub buffer, if applicable */ IRpcChannelBuffer *chan; /* server channel buffer, if applicable */ + IID iid; /* ID of interface being called */ + IUnknown *iface; /* interface being called */ HANDLE handle; /* handle that will become signaled when call finishes */ RPC_STATUS status; /* status (out) */ HRESULT hr; /* hresult (out) */ @@ -586,7 +588,8 @@ static HRESULT WINAPI ClientRpcChannelBu * from DllMain */ RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, + &params->iid, &params->iface); params->handle = ClientRpcChannelBuffer_GetEventHandle(This); if ((hr == S_OK) && !apt->multi_threaded) { @@ -954,12 +957,12 @@ void RPC_ExecuteCall(struct dispatch_par message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; message_state->binding_handle = msg->Handle; - message_state->channel_hook_info.iid = IID_NULL; /* FIXME */ + message_state->channel_hook_info.iid = params->iid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); message_state->channel_hook_info.uCausality = orpcthis.cid; message_state->channel_hook_info.dwServerPid = GetCurrentProcessId(); message_state->channel_hook_info.iMethod = msg->ProcNum; - message_state->channel_hook_info.pObject = NULL; /* FIXME */ + message_state->channel_hook_info.pObject = params->iface; if (orpcthis.extensions && first_wire_orpc_extent && orpcthis.extensions->size) @@ -975,8 +978,8 @@ void RPC_ExecuteCall(struct dispatch_par DWORD handlecall; INTERFACEINFO interface_info; - interface_info.pUnk = NULL; /* FIXME */ - interface_info.iid = IID_NULL; /* FIXME */ + interface_info.pUnk = params->iface; + interface_info.iid = params->iid; interface_info.wMethod = msg->ProcNum; handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, CALLTYPE_TOPLEVEL /* FIXME */, @@ -1033,7 +1036,8 @@ static void __RPC_STUB dispatch_rpc(RPC_ params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params)); if (!params) return RpcRaiseException(E_OUTOFMEMORY); - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, + &params->iid, &params->iface); if (hr != S_OK) { ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid)); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 520e56d..264a2e5 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -366,10 +366,11 @@ HRESULT ipid_to_stub_manager(const IPID } /* gets the apartment, stub and channel of an object. the caller must - * release the references to all objects if the function returned success, - * otherwise no references are returned. */ + * release the references to all objects (except iface) if the function + * returned success, otherwise no references are returned. */ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, - IRpcStubBuffer **stub, IRpcChannelBuffer **chan) + IRpcStubBuffer **stub, IRpcChannelBuffer **chan, + IID *iid, IUnknown **iface) { struct stub_manager *stubmgr; struct ifstub *ifstub; @@ -387,6 +388,8 @@ HRESULT ipid_get_dispatch_params(const I *chan = ifstub->chan; IRpcChannelBuffer_AddRef(*chan); *stub_apt = apt; + *iid = ifstub->iid; + *iface = ifstub->iface; stub_manager_int_release(stubmgr); return S_OK;

1 0

Rob Shearman : ole32: Call ServerNotify for channel hooks.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: c0a25d35653757c78651948379102fd93b2b7e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a25d35653757c7865194837… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:35:51 2006 +0000 ole32: Call ServerNotify for channel hooks. Store the SChannelHookCallInfo structure in the message state. --- dlls/ole32/rpc.c | 64 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 7fe984d..64269c0 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -127,6 +127,7 @@ struct message_state { RPC_BINDING_HANDLE binding_handle; ULONG prefix_data_len; + SChannelHookCallInfo channel_hook_info; }; typedef struct @@ -243,6 +244,36 @@ static unsigned char * ChannelHooks_Clie return buffer; } +static void ChannelHooks_ServerNotify(SChannelHookCallInfo *info, + DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent, + ULONG extension_count) +{ + struct channel_hook_entry *entry; + ULONG i; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + WIRE_ORPC_EXTENT *wire_orpc_extent; + for (i = 0, wire_orpc_extent = first_wire_orpc_extent; + i < extension_count; + i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]) + { + if (IsEqualGUID(&entry->id, &wire_orpc_extent->id)) + break; + } + if (i == extension_count) wire_orpc_extent = NULL; + + IChannelHook_ServerNotify(entry->hook, &entry->id, &info->iid, + wire_orpc_extent ? wire_orpc_extent->size : 0, + wire_orpc_extent ? wire_orpc_extent->data : NULL, + lDataRep); + } + + LeaveCriticalSection(&csChannelHook); +} + HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) { struct channel_hook_entry *entry; @@ -360,7 +391,6 @@ static HRESULT WINAPI ClientRpcChannelBu struct channel_hook_buffer_data *channel_hook_data; unsigned int channel_hook_count; ULONG extension_count; - SChannelHookCallInfo channel_hook_info; TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); @@ -384,14 +414,14 @@ static HRESULT WINAPI ClientRpcChannelBu msg->Handle = This->bind; msg->RpcInterfaceInformation = cif; - channel_hook_info.iid = *riid; - channel_hook_info.cbSize = sizeof(channel_hook_info); - channel_hook_info.uCausality = GUID_NULL; /* FIXME */ - channel_hook_info.dwServerPid = 0; /* FIXME */ - channel_hook_info.iMethod = msg->ProcNum; - channel_hook_info.pObject = NULL; /* only present on server-side */ + message_state->channel_hook_info.iid = *riid; + message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); + message_state->channel_hook_info.uCausality = GUID_NULL; /* FIXME */ + message_state->channel_hook_info.dwServerPid = 0; /* FIXME */ + message_state->channel_hook_info.iMethod = msg->ProcNum; + message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ - extensions_size = ChannelHooks_ClientGetSize(&channel_hook_info, + extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, &channel_hook_data, &channel_hook_count, &extension_count); msg->BufferLength += FIELD_OFFSET(ORPCTHIS, extensions) + 4; @@ -415,9 +445,9 @@ static HRESULT WINAPI ClientRpcChannelBu orpcthis->version.MajorVersion = COM_MAJOR_VERSION; orpcthis->version.MinorVersion = COM_MINOR_VERSION; - orpcthis->flags = channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL; + orpcthis->flags = message_state->channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL; orpcthis->reserved1 = 0; - orpcthis->cid = channel_hook_info.uCausality; + orpcthis->cid = message_state->channel_hook_info.uCausality; /* NDR representation of orpcthis->extensions */ *(DWORD *)msg->Buffer = extensions_size ? 1 : 0; @@ -436,7 +466,7 @@ static HRESULT WINAPI ClientRpcChannelBu *(DWORD *)msg->Buffer = (extension_count + 1) & ~1; msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - msg->Buffer = ChannelHooks_ClientFillBuffer(&channel_hook_info, + msg->Buffer = ChannelHooks_ClientFillBuffer(&message_state->channel_hook_info, msg->Buffer, channel_hook_data, channel_hook_count); /* we must add a dummy extension if there is an odd extension @@ -921,6 +951,18 @@ void RPC_ExecuteCall(struct dispatch_par message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; message_state->binding_handle = msg->Handle; + + message_state->channel_hook_info.iid = IID_NULL; /* FIXME */ + message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); + message_state->channel_hook_info.uCausality = orpcthis.cid; + message_state->channel_hook_info.dwServerPid = GetCurrentProcessId(); + message_state->channel_hook_info.iMethod = msg->ProcNum; + message_state->channel_hook_info.pObject = NULL; /* FIXME */ + + if (orpcthis.extensions && first_wire_orpc_extent && + orpcthis.extensions->size) + ChannelHooks_ServerNotify(&message_state->channel_hook_info, msg->DataRepresentation, first_wire_orpc_extent, orpcthis.extensions->size); + msg->Handle = message_state; msg->BufferLength -= message_state->prefix_data_len;

1 0

Rob Shearman : ole32: Call the message filter for incoming calls.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 9208eef55c37c7b41abc9a84d7b79823531b152a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9208eef55c37c7b41abc9a84d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:37:09 2006 +0000 ole32: Call the message filter for incoming calls. --- dlls/ole32/rpc.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 64269c0..5d66891 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -931,13 +931,15 @@ static HRESULT unmarshal_ORPCTHIS(RPC_ME void RPC_ExecuteCall(struct dispatch_params *params) { - struct message_state *message_state; + struct message_state *message_state = NULL; RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg; char *original_buffer = msg->Buffer; ORPCTHIS orpcthis; ORPC_EXTENT_ARRAY orpc_ext_array; WIRE_ORPC_EXTENT *first_wire_orpc_extent; + /* handle ORPCTHIS and server extensions */ + params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent); if (params->hr != S_OK) goto exit; @@ -966,6 +968,41 @@ void RPC_ExecuteCall(struct dispatch_par msg->Handle = message_state; msg->BufferLength -= message_state->prefix_data_len; + /* call message filter */ + + if (COM_CurrentApt()->filter) + { + DWORD handlecall; + INTERFACEINFO interface_info; + + interface_info.pUnk = NULL; /* FIXME */ + interface_info.iid = IID_NULL; /* FIXME */ + interface_info.wMethod = msg->ProcNum; + handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, + CALLTYPE_TOPLEVEL /* FIXME */, + (HTASK)GetCurrentProcessId(), + 0 /* FIXME */, + &interface_info); + TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall); + switch (handlecall) + { + case SERVERCALL_REJECTED: + params->hr = RPC_E_CALL_REJECTED; + goto exit; + case SERVERCALL_RETRYLATER: +#if 0 /* FIXME: handle retries on the client side before enabling this code */ + params->hr = RPC_E_RETRY; + goto exit; +#else + FIXME("retry call later not implemented\n"); + break; +#endif + case SERVERCALL_ISHANDLED: + default: + break; + } + } + /* invoke the method */ params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); @@ -974,9 +1011,9 @@ void RPC_ExecuteCall(struct dispatch_par msg->Handle = message_state->binding_handle; msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; msg->BufferLength += message_state->prefix_data_len; - HeapFree(GetProcessHeap(), 0, message_state); exit: + HeapFree(GetProcessHeap(), 0, message_state); IRpcStubBuffer_Release(params->stub); IRpcChannelBuffer_Release(params->chan); if (params->handle) SetEvent(params->handle); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c1e81f3..aa71790 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1290,7 +1290,7 @@ static void test_message_filter(void) ok_more_than_one_lock(); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); - todo_wine { ok(hr == RPC_E_CALL_REJECTED, "Call should have returned RPC_E_CALL_REJECTED, but return 0x%08x instead\n", hr); } + ok(hr == RPC_E_CALL_REJECTED, "Call should have returned RPC_E_CALL_REJECTED, but return 0x%08x instead\n", hr); if (proxy) IUnknown_Release(proxy); proxy = NULL;

1 0

Rob Shearman : ole32: Implement CoRegisterChannelHook and call channel hook methods on the client side .
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 5788ee9f05fb3ca716e0f97ad04c7f14edafe472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5788ee9f05fb3ca716e0f97ad… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:35:42 2006 +0000 ole32: Implement CoRegisterChannelHook and call channel hook methods on the client side. --- dlls/ole32/compobj.c | 21 +++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 +- dlls/ole32/rpc.c | 206 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 226 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5788ee9f05fb3ca716e0f…

1 0

Rob Shearman : ole32: Marshal the ORPCTHIS structure prefixed to the client data when doing ORPC calls .
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 1dc5dec6e6c3ba9a3dd7b2379244c872162a1e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc5dec6e6c3ba9a3dd7b2379… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 19:35:35 2006 +0000 ole32: Marshal the ORPCTHIS structure prefixed to the client data when doing ORPC calls. This is done by putting the ORPCTHIS data into the buffer when calling IRpcChannelBuffer::GetBuffer on the client side and then storing the amount we increased the buffer in a structure stored in the Handle field. This is done to present the correct Buffer pointer to the proxy so that it writes its data after the ORPCTHIS data. Unmarshal the data on the server side (during RPC_ExecuteCall) and make sure the data is consistent according to NDR rules. Also add several checks on the unmarshaled data that are specified by the DCOM draft specification. --- dlls/ole32/rpc.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 215 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dc5dec6e6c3ba9a3dd7b…

1 0

H. Verbeet : wined3d: Allow wined3d to handle multiple render targets.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: e4fc45e0fe2bae4e6653b54267e0419d51c66d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fc45e0fe2bae4e6653b5426… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 19 19:25:42 2006 +0100 wined3d: Allow wined3d to handle multiple render targets. --- dlls/wined3d/device.c | 28 +++++++++++++++++----------- dlls/wined3d/directx.c | 13 +++++++------ dlls/wined3d/glsl_shader.c | 12 ++++-------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8609c55..53ab337 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5643,11 +5643,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface,DWORD RenderTargetIndex, IWineD3DSurface **ppRenderTarget) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* FIXME: Implelent RenderTargetIndex >0 */ - if(RenderTargetIndex > 0) - FIXME("(%p) : RenderTargetIndex %d >0 not currently supported\n", This, RenderTargetIndex); + if (RenderTargetIndex >= GL_LIMITS(buffers)) { + ERR("(%p) : Only %d render targets are supported.\n", This, GL_LIMITS(buffers)); + return WINED3DERR_INVALIDCALL; + } - *ppRenderTarget = This->render_targets[0]; + *ppRenderTarget = This->render_targets[RenderTargetIndex]; TRACE("(%p) : RenderTarget %d Index returning %p\n", This, RenderTargetIndex, *ppRenderTarget); /* Note inc ref on returned surface */ if(*ppRenderTarget != NULL) @@ -5849,10 +5850,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl HRESULT hr = WINED3D_OK; WINED3DVIEWPORT viewport; - TRACE("(%p) Swapping rendertarget\n",This); - if (RenderTargetIndex > 0) { - FIXME("(%p) Render targets other than the first are not supported\n",This); - RenderTargetIndex = 0; + TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); + + if (RenderTargetIndex >= GL_LIMITS(buffers)) { + ERR("(%p) : Only %d render targets are supported.\n", This, GL_LIMITS(buffers)); + return WINED3DERR_INVALIDCALL; } /* MSDN says that null disables the render target @@ -5867,7 +5869,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } /* TODO: replace Impl* usage with interface usage */ - if (!((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET) { + if (pRenderTarget && !((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET) { FIXME("(%p)Trying to set the render target to a surface(%p) that wasn't created with a usage of WINED3DUSAGE_RENDERTARGET\n",This ,pRenderTarget); return WINED3DERR_INVALIDCALL; } @@ -5875,7 +5877,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl * builds, but I think wine counts as a 'debug' build for now. ******************************/ /* If we are trying to set what we already have, don't bother */ - if (pRenderTarget == This->render_targets[0]) { + if (pRenderTarget == This->render_targets[RenderTargetIndex]) { TRACE("Trying to do a NOP SetRenderTarget operation\n"); } else { /* Otherwise, set the render target up */ @@ -5890,7 +5892,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl A shared context implementation will share all buffers between all rendertargets (including swapchains), implementations that use separate pbuffers for different swapchains or rendertargets will have to duplicate the stencil buffer and incure an extra memory overhead */ - hr = IWineD3DDeviceImpl_ActiveRender(iface, pRenderTarget); + if (RenderTargetIndex == 0) { + hr = IWineD3DDeviceImpl_ActiveRender(iface, pRenderTarget); + } else { + hr = WINED3D_OK; + } /* Replace the render target */ if (This->render_targets[RenderTargetIndex]) IWineD3DSurface_Release(This->render_targets[RenderTargetIndex]); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b3b891f..fb65bab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -804,6 +804,11 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; } + /* MRTs are currently only supported when FBOs are used. */ + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { + gl_info->max_buffers = 1; + } + /* Below is a list of Nvidia and ATI GPUs. Both vendors have dozens of different GPUs with roughly the same * features. In most cases GPUs from a certain family differ in clockspeeds, the amount of video memory and * in case of the latest videocards in the number of pixel/vertex pipelines. @@ -2284,12 +2289,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDe } else *pCaps->DeclTypes = 0; -#if 0 /* We don't properly support multiple render targets yet, so disable this for now */ - if (GL_SUPPORT(ARB_DRAWBUFFERS)) { - *pCaps->NumSimultaneousRTs = GL_LIMITS(buffers); - } else -#endif - *pCaps->NumSimultaneousRTs = 1; + *pCaps->NumSimultaneousRTs = GL_LIMITS(buffers); + *pCaps->StretchRectFilterCaps = 0; *pCaps->VertexTextureFilterCaps = 0; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dffc1aa..17b6a47 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -680,17 +680,13 @@ static void shader_glsl_get_register_nam sprintf(tmpStr, "Vsampler%u", reg); break; case WINED3DSPR_COLOROUT: + if (reg >= GL_LIMITS(buffers)) { + WARN("Write to render target %u, only %d supported\n", reg, 4); + } if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { sprintf(tmpStr, "gl_FragData[%u]", reg); - if (reg > 0) { - /* TODO: See GL_ARB_draw_buffers */ - FIXME("Unsupported write to render target %u\n", reg); - } } else { /* On older cards with GLSL support like the GeforceFX there's only one buffer. */ - if (reg > 0) - WARN("This OpenGL implementation doesn't support writing to multiple render targets!\n"); - else - sprintf(tmpStr, "gl_FragColor"); + sprintf(tmpStr, "gl_FragColor"); } break; case WINED3DSPR_RASTOUT:

1 0

H. Verbeet : wined3d: Allow the FBO code to handle multiple render targets.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 299c1e62bfb879c03e03cab0a1aa000bc4984c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=299c1e62bfb879c03e03cab0a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 19 19:25:35 2006 +0100 wined3d: Allow the FBO code to handle multiple render targets. --- dlls/wined3d/device.c | 32 ++++++++++++++++++++++++++------ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a12781e..8609c55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -574,6 +574,8 @@ static ULONG WINAPI IWineD3DDeviceImpl_R HeapFree(GetProcessHeap(), 0, This->render_targets); + HeapFree(GetProcessHeap(), 0, This->draw_buffers); + /* TODO: Clean up all the surfaces and textures! */ /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ @@ -5794,14 +5796,18 @@ static void set_depth_stencil_fbo(IWineD } } -static void set_render_target_fbo(IWineD3DDevice *iface, IWineD3DSurface *render_target) { +static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; - if (This->render_offscreen) { - GLenum texttarget, target; + if (idx >= GL_LIMITS(buffers)) { + ERR("%p : Trying to set render target %d, but only %d supported\n", This, idx, GL_LIMITS(buffers)); + } - bind_fbo(iface); + bind_fbo(iface); + + if (rtimpl) { + GLenum texttarget, target; IWineD3DSurface_PreLoad(render_target); texttarget = rtimpl->glDescription.target; @@ -5812,9 +5818,23 @@ static void set_render_target_fbo(IWineD glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glBindTexture(target, 0); - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, texttarget, rtimpl->glDescription.textureName, 0)); + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, rtimpl->glDescription.textureName, 0)); checkGLcall("glFramebufferTexture2DEXT()"); + + This->draw_buffers[idx] = GL_COLOR_ATTACHMENT0_EXT + idx; } else { + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + + This->draw_buffers[idx] = GL_NONE; + } + + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { + GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); + checkGLcall("glDrawBuffers()"); + } + + if (!This->render_offscreen) { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); } @@ -5878,7 +5898,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (pRenderTarget) IWineD3DSurface_AddRef(pRenderTarget); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - set_render_target_fbo(iface, pRenderTarget); + set_render_target_fbo(iface, RenderTargetIndex, pRenderTarget); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 839b648..b3b891f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2450,6 +2450,8 @@ static HRESULT WINAPI IWineD3DImpl_Crea object->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); + object->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); + /* set the state of the device to valid */ object->state = WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13d79ed..906619a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -587,6 +587,7 @@ typedef struct IWineD3DDeviceImpl BOOL render_offscreen; WINED3D_DEPTHCOPYSTATE depth_copy_state; GLuint fbo; + GLenum *draw_buffers; /* Cursor management */ BOOL bCursorVisible;

1 0

H. Verbeet : wined3d: Move storing the render target from ActiveRender to SetRenderTarget.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 577dbb578bb1a6f4ebd80b14e6ba21bcb27099d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577dbb578bb1a6f4ebd80b14e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 19 19:25:29 2006 +0100 wined3d: Move storing the render target from ActiveRender to SetRenderTarget. Use the render target index rather than hardcoding 0. --- dlls/wined3d/device.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ecebe7f..a12781e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5871,6 +5871,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl implementations that use separate pbuffers for different swapchains or rendertargets will have to duplicate the stencil buffer and incure an extra memory overhead */ hr = IWineD3DDeviceImpl_ActiveRender(iface, pRenderTarget); + + /* Replace the render target */ + if (This->render_targets[RenderTargetIndex]) IWineD3DSurface_Release(This->render_targets[RenderTargetIndex]); + This->render_targets[RenderTargetIndex] = pRenderTarget; + if (pRenderTarget) IWineD3DSurface_AddRef(pRenderTarget); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { set_render_target_fbo(iface, pRenderTarget); } @@ -6352,13 +6358,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl device_render_to_texture(This, TRUE); } - /* Replace the render target */ - if (This->render_targets[0] != RenderSurface) { - IWineD3DSurface_Release(This->render_targets[0]); - This->render_targets[0] = RenderSurface; - IWineD3DSurface_AddRef(RenderSurface); - } - if (cfgs != NULL) XFree(cfgs); if (implicitSwapchain != NULL) IWineD3DSwapChain_Release(implicitSwapchain); if (currentSwapchain != NULL) IWineD3DSwapChain_Release(currentSwapchain);

1 0

H. Verbeet : wined3d: Allow the device to store multiple render targets.
by Alexandre Julliard Dec. 20, 2006

Dec. 20, 2006

Module: wine Branch: master Commit: 8355b1a501c24a1c68e0705f5a091161c077a210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8355b1a501c24a1c68e0705f5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 19 19:25:22 2006 +0100 wined3d: Allow the device to store multiple render targets. --- dlls/wined3d/device.c | 60 ++++++++++++++++++++------------------- dlls/wined3d/directx.c | 8 +++-- dlls/wined3d/surface.c | 16 +++++----- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8355b1a501c24a1c68e07…

1 0