August 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : ole32: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 096bf10f117ff58b40b895d7c91c3482e08ecc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096bf10f117ff58b40b895d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:26:47 2011 +0200 ole32: Specify the PSFactoryBuffer class in the idl files. --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/dcom.idl | 6 ++++++ dlls/ole32/ole32_objidl.idl | 6 ++++++ dlls/ole32/ole32_oleidl.idl | 6 ++++++ dlls/ole32/ole32_unknwn.idl | 6 ++++++ 5 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f2a83c8..624909c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -42,7 +42,6 @@ struct apartment; typedef struct apartment APARTMENT; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); -DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); /* signal to stub manager that this is a rem unknown object */ #define MSHLFLAGSP_REMUNKNOWN 0x80000000 diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index a1c0dcd..4517b46 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -22,6 +22,12 @@ import "unknwn.idl"; [ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), pointer_default(unique) ] diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index bbb91a4..057a3e3 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -97,6 +97,12 @@ coclass Picture_Dib { interface IPicture; } coclass ClassMoniker { interface IMoniker; } [ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ threading(apartment), uuid(00000323-0000-0000-c000-000000000046) ] diff --git a/dlls/ole32/ole32_oleidl.idl b/dlls/ole32/ole32_oleidl.idl index 93cf079..a3bd881 100644 --- a/dlls/ole32/ole32_oleidl.idl +++ b/dlls/ole32/ole32_oleidl.idl @@ -17,3 +17,9 @@ */ #include "oleidl.idl" + +[ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ole32/ole32_unknwn.idl b/dlls/ole32/ole32_unknwn.idl index a63f156..9be195f 100644 --- a/dlls/ole32/ole32_unknwn.idl +++ b/dlls/ole32/ole32_unknwn.idl @@ -23,3 +23,9 @@ cpp_quote("#if 0 /* oleaut32_unknwn.idl hack */") #include "unknwn.idl" cpp_quote("#endif /* oleaut32_unknwn.idl hack */") + +[ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Alexandre Julliard : oleaut32: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: df31247ede0f0fb99971b21193e81cb159cd9d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31247ede0f0fb99971b2119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:27:00 2011 +0200 oleaut32: Specify the PSFactoryBuffer class in the idl files. --- dlls/oleaut32/Makefile.in | 3 +-- dlls/oleaut32/oleaut.c | 1 + dlls/oleaut32/oleaut32_oaidl.idl | 6 ++++++ dlls/oleaut32/oleaut32_ocidl.idl | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index de61a25..ca64fc9 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -3,8 +3,7 @@ IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \ - -DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}" + -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 2a3257f..1fe6dcf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -35,6 +35,7 @@ #include "oleauto.h" #include "initguid.h" #include "typelib.h" +#include "oleaut32_oaidl.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/oleaut32_oaidl.idl b/dlls/oleaut32/oleaut32_oaidl.idl index 320e7ec..3574d08 100644 --- a/dlls/oleaut32/oleaut32_oaidl.idl +++ b/dlls/oleaut32/oleaut32_oaidl.idl @@ -23,3 +23,9 @@ cpp_quote("#if 0 /* oleaut32_oaidl.idl hack */") #include "oaidl.idl" cpp_quote("#endif /* oleaut32_oaidl.idl hack */") + +[ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index 9f6b7cf..514e5d9 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -19,6 +19,12 @@ #include "ocidl.idl" [ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ helpstring("Standard Font"), progid("StdFont"), threading(both),

1 0

Henri Verbeet : wined3d: Get rid of context_bind_fbo() calls outside context.c.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 33fafc6166c72624f159824145d1a8d5274ddf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fafc6166c72624f15982414… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 31 17:33:44 2011 +0200 wined3d: Get rid of context_bind_fbo() calls outside context.c. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 37 ++++++++++++++----------------------- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b0bc5f6..620a89b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -33,7 +33,7 @@ static DWORD wined3d_context_tls_idx; /* FBO helper functions */ /* GL locking is done by the caller */ -void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) +static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; GLuint f; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9422a0b..7c5b6d9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5010,6 +5010,7 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF struct wined3d_context *context; RECT src_rect, dst_rect; GLenum gl_filter; + GLenum buffer; TRACE("device %p, filter %s,\n", device, debug_d3dtexturefiltertype(filter)); TRACE("src_surface %p, src_location %s, src_rect %s,\n", @@ -5062,48 +5063,38 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF if (src_location == SFLAG_INDRAWABLE) { - GLenum buffer = surface_get_gl_buffer(src_surface); - TRACE("Source surface %p is onscreen.\n", src_surface); - + buffer = surface_get_gl_buffer(src_surface); surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); - - ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, NULL); - glReadBuffer(buffer); - checkGLcall("glReadBuffer()"); } else { TRACE("Source surface %p is offscreen.\n", src_surface); - ENTER_GL(); - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL, src_location); - glReadBuffer(GL_COLOR_ATTACHMENT0); - checkGLcall("glReadBuffer()"); + buffer = GL_COLOR_ATTACHMENT0; } + + ENTER_GL(); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL, src_location); + glReadBuffer(buffer); + checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); LEAVE_GL(); if (dst_location == SFLAG_INDRAWABLE) { - GLenum buffer = surface_get_gl_buffer(dst_surface); - TRACE("Destination surface %p is onscreen.\n", dst_surface); - + buffer = surface_get_gl_buffer(dst_surface); surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - - ENTER_GL(); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, buffer); } else { TRACE("Destination surface %p is offscreen.\n", dst_surface); - - ENTER_GL(); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); - context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); + buffer = GL_COLOR_ATTACHMENT0; } + + ENTER_GL(); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a7e61fb..5ad6966 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -306,7 +306,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, glReadBuffer(GL_COLOR_ATTACHMENT0); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); context_set_draw_buffer(context, GL_BACK); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -350,7 +350,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, gl_filter = GL_NEAREST; ENTER_GL(); - context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); + context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbf8641..17e8b41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1233,7 +1233,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; -void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN;

1 0

Andrew Talbot : mscms: Move a misplaced brace.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 322f3037677198b66cc87e790beeceded246023f URL: http://source.winehq.org/git/wine.git/?a=commit;h=322f3037677198b66cc87e790… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 31 21:13:08 2011 +0100 mscms: Move a misplaced brace. --- dlls/mscms/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index c9a5b42..49fc24b 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -660,9 +660,9 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi GetColorDirectoryW( machine, rgbprofile, &len ); switch (id) + { case LCS_sRGB: case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ - { lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR);

1 0

Andrew Talbot : riched20: Declare some variables unsigned.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: faa05713ad4cb299b8d2c35337d5513a54a36d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa05713ad4cb299b8d2c3533… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 31 21:13:13 2011 +0100 riched20: Declare some variables unsigned. --- dlls/riched20/run.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 3682d13..4a9ae7a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -894,8 +894,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, do { /* FIXME add more style feature comparisons */ - int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; - int nEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; + DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; + DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; run = ME_FindItemFwd(run, diRun); @@ -903,7 +903,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, tmp.cbSize = sizeof(tmp); ME_GetRunCharFormat(editor, run, &tmp); - assert((tmp.dwMask & nAttribs) == nAttribs); + assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ if (pFmt->yHeight != tmp.yHeight) @@ -929,7 +929,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & nEffects); + pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); pFmt->dwEffects = tmp.dwEffects; } while(run != run_end);

1 0

Michael Stefaniuc : dmband: Merge the IClassFactory implementations.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 2cfc711a6827d194b029a1051cafe26c74ed8685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfc711a6827d194b029a1051… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 1 10:31:49 2011 +0200 dmband: Merge the IClassFactory implementations. --- dlls/dmband/dmband_main.c | 135 ++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 81 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index b4863a3..e727ea6 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -26,111 +26,84 @@ static HINSTANCE instance; LONG DMBAND_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** - * DirectMusicBand ClassFactory + * IClassFactory implementation */ - -static HRESULT WINAPI BandCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; -} - -static ULONG WINAPI BandCF_AddRef(LPCLASSFACTORY iface) { - DMBAND_LockModule(); - - return 2; /* non-heap based object */ -} - -static ULONG WINAPI BandCF_Release(LPCLASSFACTORY iface) { - DMBAND_UnlockModule(); - - return 1; /* non-heap based object */ +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI BandCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - - return DMUSIC_CreateDirectMusicBandImpl (riid, ppobj, pOuter); +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IClassFactory_AddRef(iface); + return S_OK; } -static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DMBAND_LockModule(); - if (dolock) - DMBAND_LockModule(); - else - DMBAND_UnlockModule(); - - return S_OK; + return 2; /* non-heap based object */ } -static const IClassFactoryVtbl BandCF_Vtbl = { - BandCF_QueryInterface, - BandCF_AddRef, - BandCF_Release, - BandCF_CreateInstance, - BandCF_LockServer -}; - -static IClassFactoryImpl Band_CF = {&BandCF_Vtbl}; - - -/****************************************************************** - * DirectMusicBandTrack ClassFactory - */ - -static HRESULT WINAPI BandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DMBAND_UnlockModule(); - return E_NOINTERFACE; + return 1; /* non-heap based object */ } -static ULONG WINAPI BandTrackCF_AddRef(LPCLASSFACTORY iface) { - DMBAND_LockModule(); - - return 2; /* non-heap based object */ -} +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); -static ULONG WINAPI BandTrackCF_Release(LPCLASSFACTORY iface) { - DMBAND_UnlockModule(); + TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return 1; /* non-heap based object */ + return This->fnCreateInstance(riid, ppv, pUnkOuter); } -static HRESULT WINAPI BandTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - - return DMUSIC_CreateDirectMusicBandTrack (riid, ppobj, pOuter); -} +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("(%d)\n", dolock); -static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); + if (dolock) + DMBAND_LockModule(); + else + DMBAND_UnlockModule(); - if (dolock) - DMBAND_LockModule(); - else - DMBAND_UnlockModule(); - - return S_OK; + return S_OK; } -static const IClassFactoryVtbl BandTrackCF_Vtbl = { - BandTrackCF_QueryInterface, - BandTrackCF_AddRef, - BandTrackCF_Release, - BandTrackCF_CreateInstance, - BandTrackCF_LockServer +static const IClassFactoryVtbl classfactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer }; -static IClassFactoryImpl BandTrack_CF = {&BandTrackCF_Vtbl}; +static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandImpl}; +static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandTrack}; /****************************************************************** * DllMain

1 0

Michael Stefaniuc : devenum: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: aa591dcd9d45bc0a50066f493092de7cdd822cf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa591dcd9d45bc0a50066f493… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 1 10:34:09 2011 +0200 devenum: COM cleanup for the IClassFactory iface. --- dlls/devenum/devenum_main.c | 2 +- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/factory.c | 23 ++++++++--------------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 6867fea..e19e1e0 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -75,7 +75,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) * Oh well - works just fine as it is */ if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface((IClassFactory*)&DEVENUM_ClassFactory, iid, ppv); + return IClassFactory_QueryInterface(&DEVENUM_ClassFactory.IClassFactory_iface, iid, ppv); FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 1363e91..7515877 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -57,7 +57,7 @@ static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; typedef struct diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index 09861fa..215eb3a 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -28,10 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); /********************************************************************** * DEVENUM_IClassFactory_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, + void **ppvObj) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); @@ -56,7 +54,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( /********************************************************************** * DEVENUM_IClassFactory_AddRef (also IUnknown) */ -static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DEVENUM_IClassFactory_AddRef(IClassFactory *iface) { TRACE("\n"); @@ -68,7 +66,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface) /********************************************************************** * DEVENUM_IClassFactory_Release (also IUnknown) */ -static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); @@ -80,11 +78,8 @@ static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface) /********************************************************************** * DEVENUM_IClassFactory_CreateInstance */ -static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppvObj) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); @@ -110,9 +105,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance( /********************************************************************** * DEVENUM_IClassFactory_LockServer */ -static HRESULT WINAPI DEVENUM_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) +static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { TRACE("\n"); @@ -138,4 +131,4 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = /********************************************************************** * static ClassFactory instance */ -ClassFactoryImpl DEVENUM_ClassFactory = { &IClassFactory_Vtbl }; +ClassFactoryImpl DEVENUM_ClassFactory = { { &IClassFactory_Vtbl } };

1 0

Michael Stefaniuc : dxdiagn: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 08031fdc209135bcde10af0b47dae3e9c5c2423d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08031fdc209135bcde10af0b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 1 10:39:18 2011 +0200 dxdiagn: COM cleanup for the IClassFactory iface. --- dlls/dxdiagn/dxdiag_main.c | 50 +++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 2d8b0ea..9cfe2ab 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -19,6 +19,8 @@ * */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> @@ -53,39 +55,42 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) * DXDiag ClassFactory */ typedef struct { - const IClassFactoryVtbl *lpVtbl; - REFCLSID rclsid; - HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); + IClassFactory IClassFactory_iface; } IClassFactoryImpl; -static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { +static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - if (ppobj == NULL) return E_POINTER; + if (ppv == NULL) return E_POINTER; return E_NOINTERFACE; } -static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) { +static ULONG WINAPI DXDiagCF_AddRef(IClassFactory *iface) +{ DXDIAGN_LockModule(); return 2; /* non-heap based object */ } -static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) { +static ULONG WINAPI DXDiagCF_Release(IClassFactory * iface) +{ DXDIAGN_UnlockModule(); return 1; /* non-heap based object */ } -static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - - return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); +static HRESULT WINAPI DXDiagCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, + void **ppv) +{ + TRACE("(%p)->(%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid), ppv); + + return DXDiag_CreateDXDiagProvider(iface, pOuter, riid, ppv); } -static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { +static HRESULT WINAPI DXDiagCF_LockServer(IClassFactory *iface, BOOL dolock) +{ TRACE("(%d)\n", dolock); if (dolock) @@ -104,10 +109,7 @@ static const IClassFactoryVtbl DXDiagCF_Vtbl = { DXDiagCF_LockServer }; -static IClassFactoryImpl DXDiag_CFS[] = { - { &DXDiagCF_Vtbl, &CLSID_DxDiagProvider, DXDiag_CreateDXDiagProvider }, - { NULL, NULL, NULL } -}; +static IClassFactoryImpl DXDiag_CF = { { &DXDiagCF_Vtbl } }; /*********************************************************************** * DllCanUnloadNow (DXDIAGN.@) @@ -122,16 +124,12 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i = 0; - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - while (NULL != DXDiag_CFS[i].rclsid) { - if (IsEqualGUID(rclsid, DXDiag_CFS[i].rclsid)) { - DXDiagCF_AddRef((IClassFactory*) &DXDiag_CFS[i]); - *ppv = &DXDiag_CFS[i]; - return S_OK; - } - ++i; + + if (IsEqualGUID(rclsid, &CLSID_DxDiagProvider)) { + IClassFactory_AddRef(&DXDiag_CF.IClassFactory_iface); + *ppv = &DXDiag_CF.IClassFactory_iface; + return S_OK; } FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Michael Stefaniuc : dxdiagn: Implement IClassFactory::QueryInterface.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: a84870259f20cb14762139c28615c30feb1df63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84870259f20cb14762139c28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 1 10:41:56 2011 +0200 dxdiagn: Implement IClassFactory::QueryInterface. --- dlls/dxdiagn/dxdiag_main.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 9cfe2ab..9f10a60 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -60,11 +60,22 @@ typedef struct { static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } - if (ppv == NULL) return E_POINTER; - - return E_NOINTERFACE; + *ppv = iface; + IClassFactory_AddRef(iface); + return S_OK; } static ULONG WINAPI DXDiagCF_AddRef(IClassFactory *iface)

1 0

Jacek Caban : mshtml: Added semi-stub implementation of IHTMLWindow2:: status property.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: b25d49c6c16bd20371a5ea77fda477051794d162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25d49c6c16bd20371a5ea77f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 16:44:43 2011 +0200 mshtml: Added semi-stub implementation of IHTMLWindow2::status property. --- dlls/mshtml/htmlwindow.c | 18 ++++++++++++++---- dlls/mshtml/tests/dom.c | 27 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ba292ab..465db09 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -491,15 +491,25 @@ static HRESULT WINAPI HTMLWindow2_get_defaultStatus(IHTMLWindow2 *iface, BSTR *p static HRESULT WINAPI HTMLWindow2_put_status(IHTMLWindow2 *iface, BSTR v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + WARN("(%p)->(%s)\n", This, debugstr_w(v)); + + /* + * FIXME: Since IE7, setting status is blocked, but still possible in certain circumstances. + * Ignoring the call should be enough for us. + */ + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_status(IHTMLWindow2 *iface, BSTR *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + /* See put_status */ + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR expression, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 00fdb14..adffac2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1058,6 +1058,31 @@ static void _set_window_name(unsigned line, IHTMLWindow2 *window, const char *na _test_window_name(line, window, name); } +#define test_window_status(d) _test_window_status(__LINE__,d) +static void _test_window_status(unsigned line, IHTMLWindow2 *window) +{ + BSTR status; + HRESULT hres; + + status = (void*)0xdeadbeef; + hres = IHTMLWindow2_get_status(window, &status); + ok_(__FILE__,line)(hres == S_OK, "get_status failed: %08x\n", hres); + ok_(__FILE__,line)(!status, "status = %s\n", wine_dbgstr_w(status)); + SysFreeString(status); +} + +#define set_window_status(w,n) _set_window_status(__LINE__,w,n) +static void _set_window_status(unsigned line, IHTMLWindow2 *window, const char *status) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(status); + hres = IHTMLWindow2_put_status(window, str); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "put_status failed: %08x\n", hres); +} + #define test_window_length(w,l) _test_window_length(__LINE__,w,l) static void _test_window_length(unsigned line, IHTMLWindow2 *window, LONG exlen) { @@ -4146,6 +4171,8 @@ static void test_window(IHTMLDocument2 *doc) set_window_name(window, "test"); test_window_length(window, 0); test_screen(window); + test_window_status(window); + set_window_status(window, "Test!"); IHTMLWindow2_Release(window); }

1 0