February 2010 - Wine-commits

Henri Verbeet : wined3d: Preload textures before applying states.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 31d51fb1754d02514e28f2b8db6fbe8206834f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d51fb1754d02514e28f2b8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:21 2010 +0100 wined3d: Preload textures before applying states. --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 1 - dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3da14a..ffc105e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2214,6 +2214,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf5ad3c..0652172 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -370,6 +370,50 @@ void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, } } +static void device_preload_texture(IWineD3DStateBlockImpl *stateblock, unsigned int idx) +{ + IWineD3DBaseTextureImpl *texture; + enum WINED3DSRGB srgb; + + if (!(texture = (IWineD3DBaseTextureImpl *)stateblock->textures[idx])) return; + srgb = stateblock->samplerState[idx][WINED3DSAMP_SRGBTEXTURE] ? SRGB_SRGB : SRGB_RGB; + texture->baseTexture.internal_preload((IWineD3DBaseTexture *)texture, srgb); +} + +void device_preload_textures(IWineD3DDeviceImpl *device) +{ + IWineD3DStateBlockImpl *stateblock = device->stateBlock; + unsigned int i; + + if (use_vs(stateblock)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(stateblock)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, i); + } + } + else + { + WORD ffu_map = device->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + device_preload_texture(stateblock, i); + } + } +} + /********************************************************** * IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5384f3e..81f5386 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3527,7 +3527,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine if(stateblock->textures[sampler]) { BOOL srgb = stateblock->samplerState[sampler][WINED3DSAMP_SRGBTEXTURE]; IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; - tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afc4511..17e2733 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1620,6 +1620,7 @@ struct IWineD3DDeviceImpl HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IUnknown *parent, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN; +void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Update the stream info before applying states.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 040452ad90927aa8839b1f31a510b1b8a1afac1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=040452ad90927aa8839b1f31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:22 2010 +0100 wined3d: Update the stream info before applying states. --- dlls/wined3d/context.c | 2 + dlls/wined3d/device.c | 72 +++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 84 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 78 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=040452ad90927aa8839b1…

1 0

Henri Verbeet : wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo().
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 5f3dccddb46c3521572d0dfc3a54e9dbbdf8bf86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3dccddb46c3521572d0dfc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:23 2010 +0100 wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo(). --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f915d1b..1b5db14 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5791,6 +5791,12 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED break; } + /* Make sure the drawables are up-to-date. Note that loading the + * destination surface isn't strictly required if we overwrite the + * entire surface. */ + IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); + /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); dst_swapchain = get_swapchain(dst_surface); @@ -5806,9 +5812,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(src_surface); TRACE("Source surface %p is onscreen\n", src_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize; @@ -5845,9 +5848,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize;

1 0

Henri Verbeet : wined3d: Explicitly load and modify the surface in color_fill_fbo().
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 84913109f6396c6aa6cd18e17cca089e04d90687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84913109f6396c6aa6cd18e17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:24 2010 +0100 wined3d: Explicitly load and modify the surface in color_fill_fbo(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b5db14..79be3a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,6 +5387,9 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; + if (rect) IWineD3DSurface_LoadLocation(surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation(surface, SFLAG_INDRAWABLE, TRUE); + if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface);

1 0

Huw Davies : msdaps: Add a stub marshaller object.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 39710f8806d90d7019dc0dc1052dce14e5fbeed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39710f8806d90d7019dc0dc10… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 11:52:51 2010 +0000 msdaps: Add a stub marshaller object. --- dlls/msdaps/row_server.c | 160 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 155 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 982a631..14f11d2 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -53,16 +53,166 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) return E_NOTIMPL; } -HRESULT create_row_marshal(IUnknown *outer, void **obj) +/* Marshal impl */ + +typedef struct { - FIXME("(%p, %p): stub\n", outer, obj); - *obj = NULL; + const IMarshalVtbl *marshal_vtbl; + + LONG ref; + CLSID unmarshal_class; + IUnknown *outer; +} marshal; + +static inline marshal *impl_from_IMarshal(IMarshal *iface) +{ + return (marshal *)((char*)iface - FIELD_OFFSET(marshal, marshal_vtbl)); +} + +static HRESULT WINAPI marshal_QueryInterface(IMarshal *iface, REFIID iid, void **obj) +{ + marshal *This = impl_from_IMarshal(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), obj); + + if(IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IMarshal)) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IMarshal_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI marshal_AddRef(IMarshal *iface) +{ + marshal *This = impl_from_IMarshal(iface); + TRACE("(%p)\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI marshal_Release(IMarshal *iface) +{ + marshal *This = impl_from_IMarshal(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *obj, + DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags, CLSID *clsid) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags, clsid); + return E_NOTIMPL; } -HRESULT create_rowset_marshal(IUnknown *outer, void **obj) +static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *obj, + DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags, DWORD *size) { - FIXME("(%p, %p): stub\n", outer, obj); + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, + void *obj, DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p, %s, %p, %08x, %p, %08x): stub\n", This, stream, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID iid, void **obj) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p, %s, %p): stub\n", This, stream, debugstr_guid(iid), obj); *obj = NULL; + return E_NOTIMPL; } + +static HRESULT WINAPI marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%08x)\n", This, dwReserved); + + return E_NOTIMPL; +} + +static const IMarshalVtbl marshal_vtbl = +{ + marshal_QueryInterface, + marshal_AddRef, + marshal_Release, + marshal_GetUnmarshalClass, + marshal_GetMarshalSizeMax, + marshal_MarshalInterface, + marshal_UnmarshalInterface, + marshal_ReleaseMarshalData, + marshal_DisconnectObject +}; + +static HRESULT create_marshal(IUnknown *outer, const CLSID *class, void **obj) +{ + marshal *marshal; + + TRACE("(%p, %p)\n", outer, obj); + *obj = NULL; + + marshal = HeapAlloc(GetProcessHeap(), 0, sizeof(*marshal)); + if(!marshal) return E_OUTOFMEMORY; + + marshal->unmarshal_class = *class; + marshal->outer = outer; /* don't ref outer unk */ + marshal->marshal_vtbl = &marshal_vtbl; + marshal->ref = 1; + + *obj = &marshal->marshal_vtbl; + TRACE("returing %p\n", *obj); + return S_OK; +} + +HRESULT create_row_marshal(IUnknown *outer, void **obj) +{ + TRACE("(%p, %p)\n", outer, obj); + return create_marshal(outer, &CLSID_wine_row_proxy, obj); +} + +HRESULT create_rowset_marshal(IUnknown *outer, void **obj) +{ + TRACE("(%p, %p)\n", outer, obj); + return create_marshal(outer, &CLSID_wine_rowset_proxy, obj); +}

1 0

Huw Davies : msdaps: Add a stub server object.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: d1dfdd72cf4eb000f743f028d1f560641c0d7159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dfdd72cf4eb000f743f028d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 12:07:12 2010 +0000 msdaps: Add a stub server object. --- dlls/msdaps/row_server.c | 128 +++++++++++++++++++++++++++++++++++++++++-- dlls/msdaps/row_server.idl | 14 +++++ 2 files changed, 136 insertions(+), 6 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 14f11d2..11ace6c 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -39,18 +39,134 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -HRESULT create_row_server(IUnknown *outer, void **obj) + +typedef struct +{ + const IWineRowServerVtbl *vtbl; + + LONG ref; + + CLSID class; + IMarshal *marshal; + IUnknown *inner_unk; +} server; + +static inline server *impl_from_IWineRowServer(IWineRowServer *iface) +{ + return (server *)((char*)iface - FIELD_OFFSET(server, vtbl)); +} + +static HRESULT WINAPI server_QueryInterface(IWineRowServer *iface, REFIID riid, void **obj) { - FIXME("(%p, %p): stub\n", outer, obj); + server *This = impl_from_IWineRowServer(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + *obj = NULL; - return E_NOTIMPL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWineRowServer)) + { + *obj = iface; + } + else + { + if(!IsEqualIID(riid, &IID_IMarshal)) /* We use standard marshalling */ + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWineRowServer_AddRef(iface); + return S_OK; } -HRESULT create_rowset_server(IUnknown *outer, void **obj) +static ULONG WINAPI server_AddRef(IWineRowServer *iface) +{ + server *This = impl_from_IWineRowServer(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI server_Release(IWineRowServer *iface) +{ + server *This = impl_from_IWineRowServer(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + IMarshal_Release(This->marshal); + if(This->inner_unk) IUnknown_Release(This->inner_unk); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI server_SetInnerUnk(IWineRowServer *iface, IUnknown *inner) +{ + server *This = impl_from_IWineRowServer(iface); + + if(This->inner_unk) IUnknown_Release(This->inner_unk); + + if(inner) IUnknown_AddRef(inner); + This->inner_unk = inner; + return S_OK; +} + +static HRESULT WINAPI server_GetMarshal(IWineRowServer *iface, IMarshal **marshal) +{ + server *This = impl_from_IWineRowServer(iface); + + IMarshal_AddRef(This->marshal); + *marshal = This->marshal; + return S_OK; +} + +static const IWineRowServerVtbl server_vtbl = { - FIXME("(%p, %p): stub\n", outer, obj); + server_QueryInterface, + server_AddRef, + server_Release, + server_SetInnerUnk, + server_GetMarshal +}; + +static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) +{ + server *server; + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(class), obj); + *obj = NULL; - return E_NOTIMPL; + + server = HeapAlloc(GetProcessHeap(), 0, sizeof(*server)); + if(!server) return E_OUTOFMEMORY; + + server->vtbl = &server_vtbl; + server->ref = 1; + server->class = *class; + server->inner_unk = NULL; + if(IsEqualGUID(class, &CLSID_wine_row_server)) + create_row_marshal((IUnknown*)server, (void**)&server->marshal); + else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) + create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + else + ERR("create_server called with class %s\n", debugstr_guid(class)); + + *obj = server; + return S_OK; +} + +HRESULT create_row_server(IUnknown *outer, void **obj) +{ + return create_server(outer, &CLSID_wine_row_server, obj); +} + +HRESULT create_rowset_server(IUnknown *outer, void **obj) +{ + return create_server(outer, &CLSID_wine_rowset_server, obj); } /* Marshal impl */ diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 4da585f..f6d6303 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "oledb.idl"; + +[ + object, + uuid(38248178-cf6d-11de-abe5-000c2916d865), + pointer_default(unique) +] +interface IWineRowServer : IUnknown +{ + [local] HRESULT SetInnerUnk([in] IUnknown *unknown); + + [local] HRESULT GetMarshal([out] IMarshal **marshal); +} + [ uuid(38248178-cf6d-11de-abe5-000c2916d865) ]

1 0

Huw Davies : msdaps: Implement the marshalling object.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 3cd0fde34a5c97bccd15edabde39009d43197913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0fde34a5c97bccd15edabd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 13:36:25 2010 +0000 msdaps: Implement the marshalling object. --- dlls/msdaps/row_server.c | 47 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 11ace6c..017f8c4 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -169,6 +169,13 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) return create_server(outer, &CLSID_wine_rowset_server, obj); } +HRESULT create_proxy(IWineRowServer *server, const CLSID *class, IUnknown **obj) +{ + FIXME("stub\n"); + *obj = NULL; + return E_NOTIMPL; +} + /* Marshal impl */ typedef struct @@ -234,10 +241,11 @@ static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, voi DWORD mshlflags, CLSID *clsid) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%s, %p, %08x, %p, %08x, %p)\n", This, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + *clsid = This->unmarshal_class; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *obj, @@ -245,10 +253,11 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi DWORD mshlflags, DWORD *size) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%s, %p, %08x, %p, %08x, %p)\n", This, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags, size); - return E_NOTIMPL; + return CoGetMarshalSizeMax(size, &IID_IWineRowServer, This->outer, dwDestContext, pvDestContext, + mshlflags); } static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, @@ -256,28 +265,44 @@ static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, DWORD mshlflags) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p, %s, %p, %08x, %p, %08x): stub\n", This, stream, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%p, %s, %p, %08x, %p, %08x)\n", This, stream, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + return CoMarshalInterface(stream, &IID_IWineRowServer, This->outer, dwDestContext, pvDestContext, mshlflags); } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void **obj) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p, %s, %p): stub\n", This, stream, debugstr_guid(iid), obj); + HRESULT hr; + IWineRowServer *server; + IUnknown *proxy; + + TRACE("(%p)->(%p, %s, %p)\n", This, stream, debugstr_guid(iid), obj); *obj = NULL; - return E_NOTIMPL; + hr = CoUnmarshalInterface(stream, &IID_IWineRowServer, (void**)&server); + if(SUCCEEDED(hr)) + { + hr = create_proxy(server, &This->unmarshal_class, &proxy); + if(SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(proxy, iid, obj); + IUnknown_Release(proxy); + } + IWineRowServer_Release(server); + } + + TRACE("returing %p\n", *obj); + return hr; } static HRESULT WINAPI marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p): stub\n", This, stream); - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, stream); + return CoReleaseMarshalData(stream); } static HRESULT WINAPI marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved)

1 0

Hans Leidekker : msi: Implement the ScheduleReboot standard action.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 29f47299c2e93e743dce2c19f8a68d6098718b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f47299c2e93e743dce2c19f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 09:20:22 2010 +0100 msi: Implement the ScheduleReboot standard action. --- dlls/msi/action.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4b2d5b4..885b415 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5920,6 +5920,13 @@ done: return r; } +static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) +{ + TRACE("\n"); + package->need_reboot = 1; + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -6188,7 +6195,7 @@ StandardActions[] = { szRemoveShortcuts, ACTION_RemoveShortcuts }, { szResolveSource, ACTION_ResolveSource }, { szRMCCPSearch, ACTION_RMCCPSearch }, - { szScheduleReboot, NULL }, + { szScheduleReboot, ACTION_ScheduleReboot }, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules }, { szSetODBCFolders, ACTION_SetODBCFolders },

1 0

Hans Leidekker : msi: Move some helpers to the module where they are used.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 9a0020ade9f8694085b30368db15f6dbea87a7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0020ade9f8694085b30368d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 09:20:56 2010 +0100 msi: Move some helpers to the module where they are used. --- dlls/msi/helpers.c | 232 --------------------------------------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a0020ade9f8694085b30…

1 0

Peter Rosin : ntdll: Add tests for RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 2cf159f61277de5c8b6d897f276365ff6dd38bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf159f61277de5c8b6d897f2… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Tue Feb 2 13:47:06 2010 +0100 ntdll: Add tests for RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/tests/rtl.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6bc12bb..61ceb72 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -67,6 +67,11 @@ static RTL_HANDLE * (WINAPI * pRtlAllocateHandle)(RTL_HANDLE_TABLE *, ULONG *); static BOOLEAN (WINAPI * pRtlFreeHandle)(RTL_HANDLE_TABLE *, RTL_HANDLE *); static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*); static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); +static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); +static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); +static HMODULE hkernel32 = 0; +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ static ULONG src_aligned_block[4]; @@ -99,6 +104,14 @@ static void InitFunctionPtrs(void) pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); + pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); + pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); + pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); + } + hkernel32 = LoadLibraryA("kernel32.dll"); + ok(hkernel32 != 0, "LoadLibrary failed\n"); + if (hkernel32) { + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); } strcpy((char*)src_aligned_block, src_src); ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); @@ -1017,6 +1030,70 @@ static void test_RtlDeleteTimer(void) "expected STATUS_INVALID_PARAMETER_1 or STATUS_INVALID_PARAMETER, got %x\n", ret); } +static void test_RtlThreadErrorMode(void) +{ + DWORD oldmode; + BOOL is_wow64; + DWORD mode; + NTSTATUS status; + + if (!pRtlGetThreadErrorMode || !pRtlSetThreadErrorMode) + { + skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); + return; + } + + if (!pIsWow64Process || !pIsWow64Process(GetCurrentProcess(), &is_wow64)) + is_wow64 = FALSE; + + oldmode = pRtlGetThreadErrorMode(); + + status = pRtlSetThreadErrorMode(0x70, &mode); + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + ok(mode == oldmode, + "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + mode, oldmode); + ok(pRtlGetThreadErrorMode() == 0x70, + "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0x70); + if (!is_wow64 && pNtCurrentTeb) + ok(pNtCurrentTeb()->HardErrorDisabled == 0x70, + "The TEB contains 0x%x, expected 0x%x\n", + pNtCurrentTeb()->HardErrorDisabled, 0x70); + + status = pRtlSetThreadErrorMode(0, &mode); + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + ok(mode == 0x70, + "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + mode, 0x70); + ok(pRtlGetThreadErrorMode() == 0, + "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0); + if (!is_wow64 && pNtCurrentTeb) + ok(pNtCurrentTeb()->HardErrorDisabled == 0, + "The TEB contains 0x%x, expected 0x%x\n", + pNtCurrentTeb()->HardErrorDisabled, 0); + + for (mode = 1; mode; mode <<= 1) + { + status = pRtlSetThreadErrorMode(mode, NULL); + if (mode & 0x70) + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode(%x,NULL) failed with error 0x%08x\n", + mode, status); + else + ok(status == STATUS_INVALID_PARAMETER_1, + "RtlSetThreadErrorMode(%x,NULL) returns 0x%08x, " + "expected STATUS_INVALID_PARAMETER_1\n", + mode, status); + } + + pRtlSetThreadErrorMode(oldmode, NULL); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1036,4 +1113,5 @@ START_TEST(rtl) test_HandleTables(); test_RtlAllocateAndInitializeSid(); test_RtlDeleteTimer(); + test_RtlThreadErrorMode(); }

1 0