December 2010 - Wine-commits

Michael Stefaniuc : fusion: Use an iface instead of a vtbl pointer in IAssemblyEnumImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: b194b778b4a1dcab9ecda053ebe35fa7b153dfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b194b778b4a1dcab9ecda053e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:13:29 2010 +0100 fusion: Use an iface instead of a vtbl pointer in IAssemblyEnumImpl. --- dlls/fusion/asmenum.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index d4ea905..99462ed 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -45,17 +45,22 @@ typedef struct _tagASMNAME typedef struct { - const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; + IAssemblyEnum IAssemblyEnum_iface; struct list assemblies; struct list *iter; LONG ref; } IAssemblyEnumImpl; +static inline IAssemblyEnumImpl *impl_from_IAssemblyEnum(IAssemblyEnum *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyEnumImpl, IAssemblyEnum_iface); +} + static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -75,7 +80,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -85,7 +90,7 @@ static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedDecrement(&This->ref); struct list *item, *cursor; @@ -113,7 +118,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, IAssemblyName **ppName, DWORD dwFlags) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); ASMNAME *asmname; TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); @@ -135,7 +140,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); TRACE("(%p)\n", iface); @@ -431,7 +436,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (!asmenum) return E_OUTOFMEMORY; - asmenum->lpIAssemblyEnumVtbl = &AssemblyEnumVtbl; + asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; list_init(&asmenum->assemblies); @@ -446,7 +451,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, } asmenum->iter = list_head(&asmenum->assemblies); - *pEnum = (IAssemblyEnum *)asmenum; + *pEnum = &asmenum->IAssemblyEnum_iface; return S_OK; }

1 0

André Hentschel : winemaker: Remove a comment.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 9a1000c8cc88c78309d5ad017e7e4f2f1c2d825b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1000c8cc88c78309d5ad017… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 3 19:30:41 2010 +0100 winemaker: Remove a comment. --- tools/winemaker | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 28fc9bd..7e98d77 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1980,8 +1980,6 @@ sub fix_file($$$) } print " $filename\n"; - #FIXME:assuming that because there is a .bak file, this is what we want is - #probably flawed. Or is it??? if (! -e "$filename.bak") { if (!copy("$filename","$filename.bak")) { print STDERR "error: unable to make a backup of $filename:\n";

1 0

Jacek Caban : mshtml: Make translate_url IUri-based.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: a03da2296577386a2b61f10fc8210f125b7ead89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03da2296577386a2b61f10fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 4 14:19:54 2010 +0100 mshtml: Make translate_url IUri-based. --- dlls/mshtml/nsio.c | 108 +++++++++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 412b1d4..aef54ee 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -192,58 +192,6 @@ HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, return S_OK; } -static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) -{ - OLECHAR *new_url = NULL, *url; - BOOL ret = FALSE; - HRESULT hres; - - if(!doc->hostui) - return FALSE; - - url = heap_strdupW(uri->wine_url); - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - if(hres == S_OK && new_url) { - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - CoTaskMemFree(new_url); - } - - heap_free(url); - return ret; -} - -nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retval) -{ - nsWineURI *wine_uri; - nsresult nsres; - - *_retval = FALSE; - - nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - WARN("Could not get nsWineURI: %08x\n", nsres); - return NS_ERROR_NOT_IMPLEMENTED; - } - - if(!wine_uri->is_doc_uri) { - wine_uri->is_doc_uri = TRUE; - - if(!wine_uri->container) { - nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); - wine_uri->container = nscontainer; - } - - if(nscontainer->doc) - *_retval = translate_url(nscontainer->doc, wine_uri); - } - - nsIURI_Release(NSURI(wine_uri)); - return NS_OK; -} - HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) { TRACE("(%p)->(%s)\n", This, debugstr_w(url)); @@ -3107,6 +3055,62 @@ static const nsIFactoryVtbl nsIOServiceFactoryVtbl = { static nsIFactory nsIOServiceFactory = { &nsIOServiceFactoryVtbl }; +static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) +{ + OLECHAR *new_url = NULL; + WCHAR *url; + BOOL ret = FALSE; + HRESULT hres; + + if(!doc->hostui || !ensure_uri(uri)) + return FALSE; + + hres = IUri_GetDisplayUri(uri->uri, &url); + if(FAILED(hres)) + return FALSE; + + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); + if(hres == S_OK && new_url) { + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + CoTaskMemFree(new_url); + } + + SysFreeString(url); + return ret; +} + +nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retval) +{ + nsWineURI *wine_uri; + nsresult nsres; + + *_retval = FALSE; + + nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + WARN("Could not get nsWineURI: %08x\n", nsres); + return NS_ERROR_NOT_IMPLEMENTED; + } + + if(!wine_uri->is_doc_uri) { + wine_uri->is_doc_uri = TRUE; + + if(!wine_uri->container) { + nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); + wine_uri->container = nscontainer; + } + + if(nscontainer->doc) + *_retval = translate_url(nscontainer->doc, wine_uri); + } + + nsIURI_Release(NSURI(wine_uri)); + return NS_OK; +} + void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *registrar) { nsIFactory *old_factory = NULL;

1 0

André Hentschel : include: Add more well known sid types.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: e230d88d7428409b2514bf41b4183be895e75b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e230d88d7428409b2514bf41b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 4 16:37:42 2010 +0100 include: Add more well known sid types. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b72a952..380ad3f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4239,6 +4239,12 @@ typedef enum { WinEnterpriseReadonlyControllersSid = 74, WinAccountReadonlyControllersSid = 75, WinBuiltinEventLogReadersGroup = 76, + WinNewEnterpriseReadonlyControllersSid = 77, + WinBuiltinCertSvcDComAccessGroup = 78, + WinMediumPlusLabelSid = 79, + WinLocalLogonSid = 80, + WinConsoleLogonSid = 81, + WinThisOrganizationCertificateSid = 82, } WELL_KNOWN_SID_TYPE; /*

1 0

André Hentschel : include: Add more progressbar defines.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 5e95e3d943ce5eb99f48f22dfed624a83b94b59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e95e3d943ce5eb99f48f22df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 4 16:38:02 2010 +0100 include: Add more progressbar defines. --- include/commctrl.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 558591b..9273d40 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -483,13 +483,21 @@ static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', #define PBM_GETPOS (WM_USER+8) #define PBM_SETBARCOLOR (WM_USER+9) #define PBM_SETMARQUEE (WM_USER+10) +#define PBM_GETSTEP (WM_USER+13) #define PBM_GETBKCOLOR (WM_USER+14) #define PBM_GETBARCOLOR (WM_USER+15) +#define PBM_SETSTATE (WM_USER+16) +#define PBM_GETSTATE (WM_USER+17) #define PBM_SETBKCOLOR CCM_SETBKCOLOR #define PBS_SMOOTH 0x01 #define PBS_VERTICAL 0x04 #define PBS_MARQUEE 0x08 +#define PBS_SMOOTHREVERSE 0x10 + +#define PBST_NORMAL 1 +#define PBST_ERROR 2 +#define PBST_PAUSED 3 typedef struct {

1 0

André Hentschel : comctl32: Partially implement new messages.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: d32d1c866dadd289dcbd8f91ca3e3511a75e2a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32d1c866dadd289dcbd8f91c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 4 16:39:55 2010 +0100 comctl32: Partially implement new messages. --- dlls/comctl32/progress.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 5f2f166..1144b62 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -29,11 +29,6 @@ * * TODO: * - * Messages: - * -- PBM_GETSTEP - * -- PBM_SETSTATE - * -- PBM_GETSTATE - * * Styles: * -- PBS_SMOOTHREVERSE * @@ -662,6 +657,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return oldStep; } + case PBM_GETSTEP: + return infoPtr->Step; + case PBM_STEPIT: { INT oldVal; @@ -707,6 +705,14 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_GETBKCOLOR: return infoPtr->ColorBk; + case PBM_SETSTATE: + if(wParam != PBST_NORMAL) + FIXME("state %04lx not yet handled", wParam); + return PBST_NORMAL; + + case PBM_GETSTATE: + return PBST_NORMAL; + case PBM_SETMARQUEE: if(wParam != 0) {

1 0

Michael Stefaniuc : amstream: Use an iface instead of an vtbl pointer in IAMMultiMediaStreamImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: d335af1ec003269d08ed0341369fcb169844bb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d335af1ec003269d08ed03413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:12:01 2010 +0100 amstream: Use an iface instead of an vtbl pointer in IAMMultiMediaStreamImpl. --- dlls/amstream/amstream.c | 47 +++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 50a29c6..fe21469 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - const IAMMultiMediaStreamVtbl *lpVtbl; + IAMMultiMediaStream IAMMultiMediaStream_iface; LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; @@ -45,6 +45,11 @@ typedef struct { STREAM_TYPE StreamType; } IAMMultiMediaStreamImpl; +static inline IAMMultiMediaStreamImpl *impl_from_IAMMultiMediaStream(IAMMultiMediaStream *iface) +{ + return CONTAINING_RECORD(iface, IAMMultiMediaStreamImpl, IAMMultiMediaStream_iface); +} + static const struct IAMMultiMediaStreamVtbl AM_Vtbl; HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) @@ -63,7 +68,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) return E_OUTOFMEMORY; } - object->lpVtbl = &AM_Vtbl; + object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; *ppObj = object; @@ -74,7 +79,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) /*** IUnknown methods ***/ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream* iface, REFIID riid, void** ppvObject) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); @@ -94,7 +99,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); TRACE("(%p/%p)\n", iface, This); @@ -103,7 +108,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)\n", iface, This); @@ -117,7 +122,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) /*** IMultiMediaStream methods ***/ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, DWORD* pdwFlags, STREAM_TYPE* pStreamType) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pdwFlags, pStreamType); @@ -126,7 +131,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream* iface, REFMSPID idPurpose, IMediaStream** ppMediaStream) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); MSPID PurposeId; unsigned int i; @@ -148,7 +153,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, LONG Index, IMediaStream** ppMediaStream) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, Index, ppMediaStream); @@ -157,7 +162,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* iface, STREAM_STATE* pCurrentState) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState); @@ -166,7 +171,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE NewState) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->() stub!\n", This, iface); @@ -175,7 +180,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime); @@ -184,7 +189,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* iface, STREAM_TIME* pDuration) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); @@ -193,7 +198,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME SeekTime) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->() stub!\n", This, iface); @@ -202,7 +207,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); @@ -212,7 +217,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream /*** IAMMultiMediaStream methods ***/ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = S_OK; TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); @@ -237,7 +242,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream* iface, IGraphBuilder** ppGraphBuilder) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); TRACE("(%p/%p)->(%p)\n", This, iface, ppGraphBuilder); @@ -254,7 +259,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppFilter); @@ -264,7 +269,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* ifa static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId, DWORD dwFlags, IMediaStream** ppNewStream) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; IMediaStream* pStream; IMediaStream** pNewStreams; @@ -301,7 +306,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) { HRESULT ret; - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); IFileSourceFilter *SourceFilter; IBaseFilter *BaseFilter; IEnumPins *EnumPins; @@ -374,7 +379,7 @@ end: static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%p,%p,%x) stub!\n", This, iface, pCtx, pMoniker, dwFlags); @@ -383,7 +388,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* i static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, DWORD dwFlags) { - IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); FIXME("(%p/%p)->(%x) partial stub!\n", This, iface, dwFlags);

1 0

Michael Stefaniuc : devenum: Use an iface instead of an vtbl pointer in RegPropBagImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 66a515aef25f78c45ebb1ced1c5a2a9d93d70e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a515aef25f78c45ebb1ced1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:13:13 2010 +0100 devenum: Use an iface instead of an vtbl pointer in RegPropBagImpl. --- dlls/devenum/mediacatenum.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 349ea7d..7b44c13 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -36,18 +36,23 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); typedef struct { - const IPropertyBagVtbl *lpVtbl; + IPropertyBag IPropertyBag_iface; LONG ref; HKEY hkey; } RegPropBagImpl; +static inline RegPropBagImpl *impl_from_IPropertyBag(IPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, RegPropBagImpl, IPropertyBag_iface); +} + static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( LPPROPERTYBAG iface, REFIID riid, LPVOID *ppvObj) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); @@ -70,7 +75,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( */ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); TRACE("(%p)->() AddRef from %d\n", iface, This->ref); @@ -82,7 +87,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) */ static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); ULONG ref; TRACE("(%p)->() ReleaseThis->ref from %d\n", iface, This->ref); @@ -105,7 +110,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( LPVOID pData = NULL; DWORD received; DWORD type = 0; - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); HRESULT res = S_OK; LONG reswin32; @@ -212,7 +217,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( LPCOLESTR pszPropName, VARIANT* pVar) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); LPVOID lpData = NULL; DWORD cbData = 0; DWORD dwType = 0; @@ -277,10 +282,10 @@ static HRESULT DEVENUM_IPropertyBag_Construct(HANDLE hkey, IPropertyBag **ppBag) RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) return E_OUTOFMEMORY; - rpb->lpVtbl = &IPropertyBag_Vtbl; + rpb->IPropertyBag_iface.lpVtbl = &IPropertyBag_Vtbl; rpb->ref = 1; rpb->hkey = hkey; - *ppBag = (IPropertyBag*)rpb; + *ppBag = &rpb->IPropertyBag_iface; DEVENUM_LockModule(); return S_OK; }

1 0

Alexandre Julliard : widl: Don't force removal of progids since "CLSID" is also a progid.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 2bf6305ad6fc0f99bed07227dd716326c6916045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf6305ad6fc0f99bed07227d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 18:09:06 2010 +0100 widl: Don't force removal of progids since "CLSID" is also a progid. --- tools/widl/register.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index dcb64db..34f48fe 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -146,14 +146,14 @@ static int write_progid( const type_t *class ) if (progid) { - put_str( indent, "ForceRemove '%s' = s '%s'\n", progid, descr ); + put_str( indent, "'%s' = s '%s'\n", progid, descr ); put_str( indent++, "{\n" ); put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); put_str( --indent, "}\n" ); } if (vi_progid) { - put_str( indent, "ForceRemove '%s' = s '%s'\n", vi_progid, descr ); + put_str( indent, "'%s' = s '%s'\n", vi_progid, descr ); put_str( indent++, "{\n" ); put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); if (progid) put_str( indent, "CurVer = s '%s'\n", progid );

1 0

Alexandre Julliard : widl: Output registration information also for IUnknown.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 2f5c578dba3c756ac77582ecac5e1383127dd12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5c578dba3c756ac77582eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 19:29:43 2010 +0100 widl: Output registration information also for IUnknown. --- tools/widl/register.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 34f48fe..e3d3875 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -65,9 +65,14 @@ static int write_interface( const type_t *iface ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); - if (!type_iface_get_inherit( iface )) return 0; - if (!need_proxy( iface )) return 0; if (!uuid) return 0; + if (!is_object( iface )) return 0; + if (!type_iface_get_inherit(iface)) /* special case for IUnknown */ + { + put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + return 0; + } + if (is_local( iface->attrs )) return 0; put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++;

1 0