January 2011 - Wine-commits

Michael Stefaniuc : hlink: Use ifaces instead of vtbl pointers in ExtensionService.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 4a6c525659a8a372e0780c76dcaf7db132c208c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c525659a8a372e0780c76d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:36:48 2011 +0100 hlink: Use ifaces instead of vtbl pointers in ExtensionService. --- dlls/hlink/extserv.c | 103 ++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a6c525659a8a372e0780…

1 0

Michael Stefaniuc : atl: Use ifaces instead of vtbl pointers in IOCS.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1e19fd6c49da7fc405a68e093b176fa05a46075f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e19fd6c49da7fc405a68e093… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:37:45 2011 +0100 atl: Use ifaces instead of vtbl pointers in IOCS. --- dlls/atl/atl_ax.c | 215 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 128 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e19fd6c49da7fc405a68…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIURL iface.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1d7e50079a60664f1c75eec9a0b3d200cfe5204d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7e50079a60664f1c75eec9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:39:25 2011 +0100 mshtml: COM cleanup for the nsIURL iface. --- dlls/mshtml/nsio.c | 138 +++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d7e50079a60664f1c75e…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIInputStream iface.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1ae51aa74a1efde0dbc902064d83bc9863ab8e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae51aa74a1efde0dbc902064… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:41:05 2011 +0100 mshtml: COM cleanup for the nsIInputStream iface. --- dlls/mshtml/navigate.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 175b85b..f1731fb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define UTF16_STR "utf-16" typedef struct { - const nsIInputStreamVtbl *lpInputStreamVtbl; + nsIInputStream nsIInputStream_iface; LONG ref; @@ -53,8 +53,6 @@ typedef struct { DWORD buf_size; } nsProtocolStream; -#define NSINSTREAM(x) ((nsIInputStream*) &(x)->lpInputStreamVtbl) - typedef struct { void (*destroy)(BSCallback*); HRESULT (*init_bindinfo)(BSCallback*); @@ -91,25 +89,28 @@ struct BSCallback { struct list entry; }; -#define NSINSTREAM_THIS(iface) DEFINE_THIS(nsProtocolStream, InputStream, iface) +static inline nsProtocolStream *impl_from_nsIInputStream(nsIInputStream *iface) +{ + return CONTAINING_RECORD(iface, nsProtocolStream, nsIInputStream_iface); +} static nsresult NSAPI nsInputStream_QueryInterface(nsIInputStream *iface, nsIIDRef riid, void **result) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports %p)\n", This, result); - *result = NSINSTREAM(This); + *result = &This->nsIInputStream_iface; }else if(IsEqualGUID(&IID_nsIInputStream, riid)) { TRACE("(%p)->(IID_nsIInputStream %p)\n", This, result); - *result = NSINSTREAM(This); + *result = &This->nsIInputStream_iface; } if(*result) { - nsIInputStream_AddRef(NSINSTREAM(This)); + nsIInputStream_AddRef(&This->nsIInputStream_iface); return NS_OK; } @@ -119,7 +120,7 @@ static nsresult NSAPI nsInputStream_QueryInterface(nsIInputStream *iface, nsIIDR static nsrefcnt NSAPI nsInputStream_AddRef(nsIInputStream *iface) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -130,7 +131,7 @@ static nsrefcnt NSAPI nsInputStream_AddRef(nsIInputStream *iface) static nsrefcnt NSAPI nsInputStream_Release(nsIInputStream *iface) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -143,14 +144,14 @@ static nsrefcnt NSAPI nsInputStream_Release(nsIInputStream *iface) static nsresult NSAPI nsInputStream_Close(nsIInputStream *iface) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); FIXME("(%p)\n", This); return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint32 *_retval) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); FIXME("(%p)->(%p)\n", This, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -158,7 +159,7 @@ static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint32 *_ static nsresult NSAPI nsInputStream_Read(nsIInputStream *iface, char *aBuf, PRUint32 aCount, PRUint32 *_retval) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); DWORD read = aCount; TRACE("(%p)->(%p %d %p)\n", This, aBuf, aCount, _retval); @@ -181,7 +182,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsresult (WINAPI *aWriter)(nsIInputStream*,void*,const char*,PRUint32,PRUint32,PRUint32*), void *aClousure, PRUint32 aCount, PRUint32 *_retval) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); PRUint32 written = 0; nsresult nsres; @@ -193,7 +194,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, if(aCount > This->buf_size) aCount = This->buf_size; - nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, aCount, &written); + nsres = aWriter(&This->nsIInputStream_iface, aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) TRACE("aWritter failed: %08x\n", nsres); else if(written != This->buf_size) @@ -207,13 +208,11 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, static nsresult NSAPI nsInputStream_IsNonBlocking(nsIInputStream *iface, PRBool *_retval) { - nsProtocolStream *This = NSINSTREAM_THIS(iface); + nsProtocolStream *This = impl_from_nsIInputStream(iface); FIXME("(%p)->(%p)\n", This, _retval); return NS_ERROR_NOT_IMPLEMENTED; } -#undef NSINSTREAM_THIS - static const nsIInputStreamVtbl nsInputStreamVtbl = { nsInputStream_QueryInterface, nsInputStream_AddRef, @@ -229,7 +228,7 @@ static nsProtocolStream *create_nsprotocol_stream(void) { nsProtocolStream *ret = heap_alloc(sizeof(nsProtocolStream)); - ret->lpInputStreamVtbl = &nsInputStreamVtbl; + ret->nsIInputStream_iface.lpVtbl = &nsInputStreamVtbl; ret->ref = 1; ret->buf_size = 0; @@ -1016,7 +1015,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, - NSINSTREAM(This->nsstream), This->bsc.readed-This->nsstream->buf_size, + &This->nsstream->nsIInputStream_iface, This->bsc.readed-This->nsstream->buf_size, This->nsstream->buf_size); if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); @@ -1043,7 +1042,7 @@ static void nsChannelBSC_destroy(BSCallback *bsc) if(This->nscontext) nsISupports_Release(This->nscontext); if(This->nsstream) - nsIInputStream_Release(NSINSTREAM(This->nsstream)); + nsIInputStream_Release(&This->nsstream->nsIInputStream_iface); heap_free(This); }

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in ProtocolFactory.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 0eff947c091de89621dd7d48ae1c6adb18853b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eff947c091de89621dd7d48a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:43:29 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in ProtocolFactory. --- dlls/mshtml/protocol.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 1485881..b3aee2b 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -39,31 +39,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); * common ProtocolFactory implementation */ -#define CLASSFACTORY(x) (&(x)->lpClassFactoryVtbl) #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PROTOCOLINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl) typedef struct { - const IInternetProtocolInfoVtbl *lpInternetProtocolInfoVtbl; - const IClassFactoryVtbl *lpClassFactoryVtbl; + IInternetProtocolInfo IInternetProtocolInfo_iface; + IClassFactory IClassFactory_iface; } ProtocolFactory; -#define PROTOCOLINFO_THIS(iface) DEFINE_THIS(ProtocolFactory, InternetProtocolInfo, iface) +static inline ProtocolFactory *impl_from_IInternetProtocolInfo(IInternetProtocolInfo *iface) +{ + return CONTAINING_RECORD(iface, ProtocolFactory, IInternetProtocolInfo_iface); +} static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) { - ProtocolFactory *This = PROTOCOLINFO_THIS(iface); + ProtocolFactory *This = impl_from_IInternetProtocolInfo(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = PROTOCOLINFO(This); + *ppv = &This->IInternetProtocolInfo_iface; }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); - *ppv = PROTOCOLINFO(This); + *ppv = &This->IInternetProtocolInfo_iface; }else if(IsEqualGUID(&IID_IClassFactory, riid)) { TRACE("(%p)->(IID_IClassFactory %p)\n", This, ppv); - *ppv = CLASSFACTORY(This); + *ppv = &This->IClassFactory_iface; } if(!*ppv) { @@ -105,26 +106,27 @@ static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *ifa return E_NOTIMPL; } -#undef PROTOCOLINFO_THIS - -#define CLASSFACTORY_THIS(iface) DEFINE_THIS(ProtocolFactory, ClassFactory, iface) +static inline ProtocolFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ProtocolFactory, IClassFactory_iface); +} static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { - ProtocolFactory *This = CLASSFACTORY_THIS(iface); - return IInternetProtocolInfo_QueryInterface(PROTOCOLINFO(This), riid, ppv); + ProtocolFactory *This = impl_from_IClassFactory(iface); + return IInternetProtocolInfo_QueryInterface(&This->IInternetProtocolInfo_iface, riid, ppv); } static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - ProtocolFactory *This = CLASSFACTORY_THIS(iface); - return IInternetProtocolInfo_AddRef(PROTOCOLINFO(This)); + ProtocolFactory *This = impl_from_IClassFactory(iface); + return IInternetProtocolInfo_AddRef(&This->IInternetProtocolInfo_iface); } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - ProtocolFactory *This = CLASSFACTORY_THIS(iface); - return IInternetProtocolInfo_Release(PROTOCOLINFO(This)); + ProtocolFactory *This = impl_from_IClassFactory(iface); + return IInternetProtocolInfo_Release(&This->IInternetProtocolInfo_iface); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -133,8 +135,6 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } -#undef CLASSFACTORY_THIS - /******************************************************************** * AboutProtocol implementation */ @@ -497,8 +497,8 @@ static const IClassFactoryVtbl AboutProtocolFactoryVtbl = { }; static ProtocolFactory AboutProtocolFactory = { - &AboutProtocolInfoVtbl, - &AboutProtocolFactoryVtbl + { &AboutProtocolInfoVtbl }, + { &AboutProtocolFactoryVtbl } }; /******************************************************************** @@ -934,8 +934,8 @@ static const IClassFactoryVtbl ResProtocolFactoryVtbl = { }; static ProtocolFactory ResProtocolFactory = { - &ResProtocolInfoVtbl, - &ResProtocolFactoryVtbl + { &ResProtocolInfoVtbl }, + { &ResProtocolFactoryVtbl } }; /******************************************************************** @@ -1017,8 +1017,8 @@ static const IClassFactoryVtbl JSProtocolFactoryVtbl = { }; static ProtocolFactory JSProtocolFactory = { - &JSProtocolInfoVtbl, - &JSProtocolFactoryVtbl + { &JSProtocolInfoVtbl }, + { &JSProtocolFactoryVtbl } }; HRESULT ProtocolFactory_Create(REFCLSID rclsid, REFIID riid, void **ppv)

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in BmpFrameEncode.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 5cce70ddeb7d089ccfb124cc9e609af3af151fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cce70ddeb7d089ccfb124cc9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:46:15 2011 +0100 windowscodecs: Use an iface instead of a vtbl pointer in BmpFrameEncode. --- dlls/windowscodecs/bmpencode.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 4b3b9ea..410c646 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -58,7 +58,7 @@ static const struct bmp_pixelformat formats[] = { }; typedef struct BmpFrameEncode { - const IWICBitmapFrameEncodeVtbl *lpVtbl; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; IStream *stream; BOOL initialized; @@ -71,10 +71,15 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode; +static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, BmpFrameEncode, IWICBitmapFrameEncode_iface); +} + static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -96,7 +101,7 @@ static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -106,7 +111,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -124,7 +129,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%p)\n", iface, pIEncoderOptions); if (This->initialized) return WINCODEC_ERR_WRONGSTATE; @@ -137,7 +142,7 @@ static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; @@ -151,7 +156,7 @@ static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; @@ -165,7 +170,7 @@ static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); int i; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); @@ -224,7 +229,7 @@ static HRESULT BmpFrameEncode_AllocateBits(BmpFrameEncode *This) static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); @@ -253,7 +258,7 @@ static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; WICPixelFormatGUID guid; @@ -316,7 +321,7 @@ static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; UINT info_size; @@ -456,7 +461,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); - if (This->frame) IWICBitmapFrameEncode_Release((IWICBitmapFrameEncode*)This->frame); + if (This->frame) IWICBitmapFrameEncode_Release(&This->frame->IWICBitmapFrameEncode_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -538,7 +543,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, *ppIEncoderOptions = NULL; return E_OUTOFMEMORY; } - encode->lpVtbl = &BmpFrameEncode_Vtbl; + encode->IWICBitmapFrameEncode_iface.lpVtbl = &BmpFrameEncode_Vtbl; encode->ref = 2; IStream_AddRef(This->stream); encode->stream = This->stream; @@ -552,7 +557,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->lineswritten = 0; encode->committed = FALSE; - *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; + *ppIFrameEncode = &encode->IWICBitmapFrameEncode_iface; This->frame = encode; return S_OK;

1 0

Alexandre Julliard : uninstaller: Convert translations to po files.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 4bca33439ee59ef9e529e4c4cf907189dd58d17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bca33439ee59ef9e529e4c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 19:38:45 2011 +0100 uninstaller: Convert translations to po files. --- configure | 3 +- configure.ac | 3 +- po/LINGUAS | 1 + po/bg.po | 862 ++++++++++++++++++++++++ po/cs.po | 13 + po/da.po | 14 + po/de.po | 14 + po/en_US.po | 14 + po/eo.po | 13 + po/es.po | 14 + po/fi.po | 13 + po/fr.po | 14 + po/he.po | 13 + po/hi.po | 11 + po/hu.po | 15 + po/it.po | 14 + po/ja.po | 14 + po/ko.po | 13 + po/lt.po | 14 + po/ml.po | 11 + po/nb_NO.po | 14 + po/nl.po | 14 + po/or.po | 11 + po/pa.po | 11 + po/pl.po | 14 + po/pt_BR.po | 14 + po/pt_PT.po | 14 + po/ro.po | 14 + po/ru.po | 14 + po/sk.po | 11 + po/sl.po | 14 + po/sr_Latn_SP.po | 14 + po/sr_SP.po | 14 + po/sv.po | 14 + po/te.po | 11 + po/th.po | 11 + po/tr.po | 13 + po/uk.po | 13 + po/wa.po | 11 + po/wine.pot | 11 + po/zh_CN.po | 13 + po/zh_TW.po | 13 + programs/uninstaller/Bg.rc | 28 - programs/uninstaller/Cs.rc | 29 - programs/uninstaller/Cy.rc | 29 - programs/uninstaller/Da.rc | 28 - programs/uninstaller/De.rc | 30 - programs/uninstaller/Eo.rc | 28 - programs/uninstaller/Es.rc | 28 - programs/uninstaller/Fi.rc | 28 - programs/uninstaller/Fr.rc | 34 - programs/uninstaller/He.rc | 31 - programs/uninstaller/Hu.rc | 28 - programs/uninstaller/It.rc | 31 - programs/uninstaller/Ja.rc | 31 - programs/uninstaller/Ko.rc | 31 - programs/uninstaller/Lt.rc | 31 - programs/uninstaller/Makefile.in | 31 +- programs/uninstaller/Nl.rc | 28 - programs/uninstaller/No.rc | 28 - programs/uninstaller/Pl.rc | 29 - programs/uninstaller/Pt.rc | 38 - programs/uninstaller/Ro.rc | 29 - programs/uninstaller/Ru.rc | 31 - programs/uninstaller/Si.rc | 30 - programs/uninstaller/Sr.rc | 38 - programs/uninstaller/Sv.rc | 28 - programs/uninstaller/Tr.rc | 28 - programs/uninstaller/Uk.rc | 33 - programs/uninstaller/Zh.rc | 39 -- programs/uninstaller/{En.rc => uninstaller.rc} | 2 +- 71 files changed, 1367 insertions(+), 856 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bca33439ee59ef9e529e…

1 0

Alexandre Julliard : write: Convert translations to po files.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 26c924ee156c7c88446b9e7d91eb30ae8120e15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c924ee156c7c88446b9e7d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 19:43:36 2011 +0100 write: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- po/bg.po | 4 +++ po/cs.po | 4 +++ po/da.po | 4 +++ po/de.po | 4 +++ po/en_US.po | 4 +++ po/eo.po | 4 +++ po/es.po | 4 +++ po/fi.po | 4 +++ po/fr.po | 4 +++ po/he.po | 4 +++ po/hi.po | 4 +++ po/hu.po | 4 +++ po/it.po | 4 +++ po/ja.po | 4 +++ po/ko.po | 4 +++ po/lt.po | 4 +++ po/ml.po | 4 +++ po/nb_NO.po | 4 +++ po/nl.po | 4 +++ po/or.po | 4 +++ po/pa.po | 4 +++ po/pl.po | 4 +++ po/pt_BR.po | 4 +++ po/pt_PT.po | 4 +++ po/ro.po | 4 +++ po/ru.po | 4 +++ po/sk.po | 4 +++ po/sl.po | 4 +++ po/sr_Latn_SP.po | 4 +++ po/sr_SP.po | 4 +++ po/sv.po | 4 +++ po/te.po | 4 +++ po/th.po | 4 +++ po/tr.po | 4 +++ po/uk.po | 4 +++ po/wa.po | 4 +++ po/wine.pot | 4 +++ po/zh_CN.po | 4 +++ po/zh_TW.po | 4 +++ programs/write/Da.rc | 29 --------------------------- programs/write/De.rc | 29 --------------------------- programs/write/Es.rc | 32 ------------------------------ programs/write/Fr.rc | 30 ---------------------------- programs/write/He.rc | 31 ----------------------------- programs/write/It.rc | 31 ----------------------------- programs/write/Ja.rc | 31 ----------------------------- programs/write/Ko.rc | 29 --------------------------- programs/write/Lt.rc | 31 ----------------------------- programs/write/Makefile.in | 24 +-------------------- programs/write/Nl.rc | 28 -------------------------- programs/write/No.rc | 28 -------------------------- programs/write/Pl.rc | 28 -------------------------- programs/write/Pt.rc | 28 -------------------------- programs/write/Ro.rc | 29 --------------------------- programs/write/Ru.rc | 31 ----------------------------- programs/write/Si.rc | 30 ---------------------------- programs/write/Sr.rc | 38 ------------------------------------ programs/write/Sv.rc | 28 -------------------------- programs/write/Uk.rc | 33 ------------------------------- programs/write/Zh.rc | 31 ----------------------------- programs/write/{En.rc => write.rc} | 2 +- 63 files changed, 161 insertions(+), 630 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26c924ee156c7c88446b9…

1 0

Alexandre Julliard : xcopy: Convert translations to po files.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: f8be8ff65ef48fc050b014c497066ea68a31fa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8be8ff65ef48fc050b014c49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 20:15:50 2011 +0100 xcopy: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- po/bg.po | 97 +++++++++++++++++++++++- po/cs.po | 99 ++++++++++++++++++++++++- po/da.po | 133 ++++++++++++++++++++++++++++++++- po/de.po | 131 ++++++++++++++++++++++++++++++++- po/en_US.po | 132 ++++++++++++++++++++++++++++++++- po/eo.po | 97 +++++++++++++++++++++++- po/es.po | 99 ++++++++++++++++++++++++- po/fi.po | 97 +++++++++++++++++++++++- po/fr.po | 140 ++++++++++++++++++++++++++++++++++- po/he.po | 97 +++++++++++++++++++++++- po/hi.po | 97 +++++++++++++++++++++++- po/hu.po | 97 +++++++++++++++++++++++- po/it.po | 135 +++++++++++++++++++++++++++++++++- po/ja.po | 134 ++++++++++++++++++++++++++++++++- po/ko.po | 133 ++++++++++++++++++++++++++++++++- po/lt.po | 133 ++++++++++++++++++++++++++++++++- po/ml.po | 97 +++++++++++++++++++++++- po/nb_NO.po | 134 ++++++++++++++++++++++++++++++++- po/nl.po | 133 ++++++++++++++++++++++++++++++++- po/or.po | 97 +++++++++++++++++++++++- po/pa.po | 97 +++++++++++++++++++++++- po/pl.po | 140 ++++++++++++++++++++++++++++++++++- po/pt_BR.po | 132 ++++++++++++++++++++++++++++++++- po/pt_PT.po | 135 ++++++++++++++++++++++++++++++++- po/ro.po | 135 ++++++++++++++++++++++++++++++++- po/ru.po | 143 ++++++++++++++++++++++++++++++++++- po/sk.po | 97 +++++++++++++++++++++++- po/sl.po | 134 ++++++++++++++++++++++++++++++++- po/sr_Latn_SP.po | 135 ++++++++++++++++++++++++++++++++- po/sr_SP.po | 135 ++++++++++++++++++++++++++++++++- po/sv.po | 132 ++++++++++++++++++++++++++++++++- po/te.po | 97 +++++++++++++++++++++++- po/th.po | 97 +++++++++++++++++++++++- po/tr.po | 99 ++++++++++++++++++++++++- po/uk.po | 140 ++++++++++++++++++++++++++++++++++- po/wa.po | 97 +++++++++++++++++++++++- po/wine.pot | 97 +++++++++++++++++++++++- po/zh_CN.po | 97 +++++++++++++++++++++++- po/zh_TW.po | 97 +++++++++++++++++++++++- programs/xcopy/Da.rc | 79 -------------------- programs/xcopy/De.rc | 82 -------------------- programs/xcopy/Fr.rc | 83 --------------------- programs/xcopy/It.rc | 83 --------------------- programs/xcopy/Ja.rc | 83 --------------------- programs/xcopy/Ko.rc | 83 --------------------- programs/xcopy/Lt.rc | 83 --------------------- programs/xcopy/Makefile.in | 21 +----- programs/xcopy/Nl.rc | 81 -------------------- programs/xcopy/No.rc | 80 -------------------- programs/xcopy/Pl.rc | 80 -------------------- programs/xcopy/Pt.rc | 141 ----------------------------------- programs/xcopy/Ro.rc | 80 -------------------- programs/xcopy/Ru.rc | 86 --------------------- programs/xcopy/Si.rc | 82 -------------------- programs/xcopy/Sr.rc | 141 ----------------------------------- programs/xcopy/Sv.rc | 82 -------------------- programs/xcopy/Uk.rc | 83 --------------------- programs/xcopy/{En.rc => xcopy.rc} | 11 +-- 60 files changed, 4391 insertions(+), 1705 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8be8ff65ef48fc050b01…

1 0

Alexandre Julliard : wrc: Do not use translations that are marked fuzzy.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1898f22ca5d2d79750e9820cfe2b4204ea9432cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1898f22ca5d2d79750e9820cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 20:26:13 2011 +0100 wrc: Do not use translations that are marked fuzzy. --- tools/wrc/po.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index fff4c36..2b7ed6d 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -772,8 +772,13 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) msg = find_message( po, msgid, context, &iterator ); po_message_iterator_free( iterator ); - if (msg) (*found)++; - transl = msg ? po_message_msgstr( msg ) : msgid; + if (msg && !po_message_is_fuzzy( msg )) + { + (*found)++; + transl = po_message_msgstr( msg ); + } + else transl = msgid; + new = xmalloc( sizeof(*new) ); new->type = str_unicode; new->size = wine_utf8_mbstowcs( 0, transl, strlen(transl), NULL, 0 );

1 0