May 2012 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmap methods.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 1f0ec3cba5ce6e3089b572ea6ca82cf50e3a9b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0ec3cba5ce6e3089b572ea6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:41:44 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmap methods. --- dlls/windowscodecs/proxy.c | 18 ++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index b8cfcbc..011c074 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -84,6 +84,24 @@ HRESULT WINAPI IWICBitmapSource_CopyPixels_Proxy_W(IWICBitmapSource *iface, return IWICBitmapSource_CopyPixels(iface, prc, cbStride, cbBufferSize, pbBuffer); } +HRESULT WINAPI IWICBitmap_Lock_Proxy_W(IWICBitmap *iface, + const WICRect *prcLock, DWORD flags, IWICBitmapLock **ppILock) +{ + return IWICBitmap_Lock(iface, prcLock, flags, ppILock); +} + +HRESULT WINAPI IWICBitmap_SetPalette_Proxy_W(IWICBitmap *iface, + IWICPalette *pIPalette) +{ + return IWICBitmap_SetPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICBitmap_SetResolution_Proxy_W(IWICBitmap *iface, + double dpiX, double dpiY) +{ + return IWICBitmap_SetResolution(iface, dpiX, dpiY); +} + HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 65cb54b..813b7d9 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -49,9 +49,9 @@ @ stdcall IWICBitmapSource_GetPixelFormat_Proxy(ptr ptr) IWICBitmapSource_GetPixelFormat_Proxy_W @ stdcall IWICBitmapSource_GetResolution_Proxy(ptr ptr ptr) IWICBitmapSource_GetResolution_Proxy_W @ stdcall IWICBitmapSource_GetSize_Proxy(ptr ptr ptr) IWICBitmapSource_GetSize_Proxy_W -@ stub IWICBitmap_Lock_Proxy -@ stub IWICBitmap_SetPalette_Proxy -@ stub IWICBitmap_SetResolution_Proxy +@ stdcall IWICBitmap_Lock_Proxy(ptr ptr long ptr) IWICBitmap_Lock_Proxy_W +@ stdcall IWICBitmap_SetPalette_Proxy(ptr ptr) IWICBitmap_SetPalette_Proxy_W +@ stdcall IWICBitmap_SetResolution_Proxy(ptr double double) IWICBitmap_SetResolution_Proxy_W @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W @ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy @ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICPalette methods.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 2fc7cdc93f6dc8ed67498b74193423c44e5bb770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc7cdc93f6dc8ed67498b741… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:49:22 2012 -0500 windowscodecs: Add wrapper functions for IWICPalette methods. --- dlls/windowscodecs/proxy.c | 48 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 16 +++++----- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 011c074..ec3ed9b 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -247,6 +247,54 @@ HRESULT WINAPI IWICImagingFactory_CreateStream_Proxy_W(IWICImagingFactory *pFact return IWICImagingFactory_CreateStream(pFactory, ppIWICStream); } +HRESULT WINAPI IWICPalette_InitializePredefined_Proxy_W(IWICPalette *iface, + WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) +{ + return IWICPalette_InitializePredefined(iface, ePaletteType, fAddTransparentColor); +} + +HRESULT WINAPI IWICPalette_InitializeCustom_Proxy_W(IWICPalette *iface, + WICColor *pColors, UINT colorCount) +{ + return IWICPalette_InitializeCustom(iface, pColors, colorCount); +} + +HRESULT WINAPI IWICPalette_InitializeFromBitmap_Proxy_W(IWICPalette *iface, + IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +{ + return IWICPalette_InitializeFromBitmap(iface, pISurface, colorCount, fAddTransparentColor); +} + +HRESULT WINAPI IWICPalette_InitializeFromPalette_Proxy_W(IWICPalette *iface, + IWICPalette *pIPalette) +{ + return IWICPalette_InitializeFromPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICPalette_GetType_Proxy_W(IWICPalette *iface, + WICBitmapPaletteType *pePaletteType) +{ + return IWICPalette_GetType(iface, pePaletteType); +} + +HRESULT WINAPI IWICPalette_GetColorCount_Proxy_W(IWICPalette *iface, + UINT *pcCount) +{ + return IWICPalette_GetColorCount(iface, pcCount); +} + +HRESULT WINAPI IWICPalette_GetColors_Proxy_W(IWICPalette *iface, + UINT colorCount, WICColor *pColors, UINT *pcActualColors) +{ + return IWICPalette_GetColors(iface, colorCount, pColors, pcActualColors); +} + +HRESULT WINAPI IWICPalette_HasAlpha_Proxy_W(IWICPalette *iface, + BOOL *pfHasAlpha) +{ + return IWICPalette_HasAlpha(iface, pfHasAlpha); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 813b7d9..8636343 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -91,14 +91,14 @@ @ stub IWICMetadataQueryReader_GetMetadataByName_Proxy @ stub IWICMetadataQueryWriter_RemoveMetadataByName_Proxy @ stub IWICMetadataQueryWriter_SetMetadataByName_Proxy -@ stub IWICPalette_GetColorCount_Proxy -@ stub IWICPalette_GetColors_Proxy -@ stub IWICPalette_GetType_Proxy -@ stub IWICPalette_HasAlpha_Proxy -@ stub IWICPalette_InitializeCustom_Proxy -@ stub IWICPalette_InitializeFromBitmap_Proxy -@ stub IWICPalette_InitializeFromPalette_Proxy -@ stub IWICPalette_InitializePredefined_Proxy +@ stdcall IWICPalette_GetColorCount_Proxy(ptr ptr) IWICPalette_GetColorCount_Proxy_W +@ stdcall IWICPalette_GetColors_Proxy(ptr long ptr ptr) IWICPalette_GetColors_Proxy_W +@ stdcall IWICPalette_GetType_Proxy(ptr ptr) IWICPalette_GetType_Proxy_W +@ stdcall IWICPalette_HasAlpha_Proxy(ptr ptr) IWICPalette_HasAlpha_Proxy_W +@ stdcall IWICPalette_InitializeCustom_Proxy(ptr ptr long) IWICPalette_InitializeCustom_Proxy_W +@ stdcall IWICPalette_InitializeFromBitmap_Proxy(ptr ptr long long) IWICPalette_InitializeFromBitmap_Proxy_W +@ stdcall IWICPalette_InitializeFromPalette_Proxy(ptr ptr) IWICPalette_InitializeFromPalette_Proxy_W +@ stdcall IWICPalette_InitializePredefined_Proxy(ptr long long) IWICPalette_InitializePredefined_Proxy_W @ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy @ stub IWICPixelFormatInfo_GetChannelCount_Proxy @ stub IWICPixelFormatInfo_GetChannelMask_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICComponentInfo methods.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: de9d18c6ff4ba90bf6ed8e655949a48caabc95c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9d18c6ff4ba90bf6ed8e655… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:55:30 2012 -0500 windowscodecs: Add wrapper functions for IWICComponentInfo methods. --- dlls/windowscodecs/proxy.c | 30 ++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 10 +++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index ec3ed9b..c1c99ca 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -108,6 +108,36 @@ HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *i return IWICColorContext_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICComponentInfo_GetCLSID_Proxy_W(IWICComponentInfo *iface, + CLSID *pclsid) +{ + return IWICComponentInfo_GetCLSID(iface, pclsid); +} + +HRESULT WINAPI IWICComponentInfo_GetAuthor_Proxy_W(IWICComponentInfo *iface, + UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) +{ + return IWICComponentInfo_GetAuthor(iface, cchAuthor, wzAuthor, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetVersion_Proxy_W(IWICComponentInfo *iface, + UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) +{ + return IWICComponentInfo_GetVersion(iface, cchVersion, wzVersion, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetSpecVersion_Proxy_W(IWICComponentInfo *iface, + UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) +{ + return IWICComponentInfo_GetSpecVersion(iface, cchSpecVersion, wzSpecVersion, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetFriendlyName_Proxy_W(IWICComponentInfo *iface, + UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) +{ + return IWICComponentInfo_GetFriendlyName(iface, cchFriendlyName, wzFriendlyName, pcchActual); +} + HRESULT WINAPI IWICFastMetadataEncoder_Commit_Proxy_W(IWICFastMetadataEncoder *iface) { return IWICFastMetadataEncoder_Commit(iface); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 8636343..930f2c4 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -55,11 +55,11 @@ @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W @ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy @ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy -@ stub IWICComponentInfo_GetAuthor_Proxy -@ stub IWICComponentInfo_GetCLSID_Proxy -@ stub IWICComponentInfo_GetFriendlyName_Proxy -@ stub IWICComponentInfo_GetSpecVersion_Proxy -@ stub IWICComponentInfo_GetVersion_Proxy +@ stdcall IWICComponentInfo_GetAuthor_Proxy(ptr long ptr ptr) IWICComponentInfo_GetAuthor_Proxy_W +@ stdcall IWICComponentInfo_GetCLSID_Proxy(ptr ptr) IWICComponentInfo_GetCLSID_Proxy_W +@ stdcall IWICComponentInfo_GetFriendlyName_Proxy(ptr long ptr ptr) IWICComponentInfo_GetFriendlyName_Proxy_W +@ stdcall IWICComponentInfo_GetSpecVersion_Proxy(ptr long ptr ptr) IWICComponentInfo_GetSpecVersion_Proxy_W +@ stdcall IWICComponentInfo_GetVersion_Proxy(ptr long ptr ptr) IWICComponentInfo_GetVersion_Proxy_W @ stdcall IWICFastMetadataEncoder_Commit_Proxy(ptr) IWICFastMetadataEncoder_Commit_Proxy_W @ stdcall IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy(ptr ptr) IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy_W @ stub IWICFormatConverter_Initialize_Proxy

1 0

Akihiro Sagawa : po: Refine Japanese translation to aid understanding.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 08c552a0bdac7bbd2ad961612f8124996d0abdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c552a0bdac7bbd2ad961612… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 9 23:16:27 2012 +0900 po: Refine Japanese translation to aid understanding. --- po/ja.po | 306 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 153 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c552a0bdac7bbd2ad96…

1 0

Dan Kegel : riched20: Don' t need to redraw when changing selection from none to none.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 499604337461d0fbd9f922022fa86a9fc0434317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499604337461d0fbd9f922022… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 9 14:53:01 2012 -0700 riched20: Don't need to redraw when changing selection from none to none. --- dlls/riched20/caret.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 093bd20..7decff2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -146,8 +146,11 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { int start, end; ME_GetSelectionOfs(editor, &start, &end); - editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); + if (start != end) + { + editor->pCursors[1] = editor->pCursors[0]; + ME_Repaint(editor); + } ME_ClearTempStyle(editor); return end; }

1 0

Christian Costa : d3drm/tests: Fix error message.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 3e24242618047ae9a1be5fa71953def16c3c55cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e24242618047ae9a1be5fa71… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:12 2012 +0200 d3drm/tests: Fix error message. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c48cc2c..64f93cf 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -779,7 +779,7 @@ static const GUID* refiids[] = static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) { ok(object != NULL, "Arg 1 should not be null\n"); - ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 should is incorrect\n"); + ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 is incorrect\n"); ok(arg == (LPVOID)0xdeadbeef, "Arg 3 should be 0xdeadbeef (got %p)\n", arg); nb_objects++; }

1 0

Christian Costa : d3drm: Move some unsafe_impl_from_* call to where variables are declared.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 4a53e89c113b3beee3a9067acf131f025e646cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a53e89c113b3beee3a9067ac… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:20 2012 +0200 d3drm: Move some unsafe_impl_from_* call to where variables are declared. --- dlls/d3drm/frame.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b3d2f60..60e8966 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -224,12 +224,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *frame; + IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); TRACE("(%p/%p)->(%p)\n", iface, This, child); - frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); - if (!frame) return D3DRMERR_BADOBJECT; @@ -524,12 +522,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *child; + IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); TRACE("(%p/%p)->(%p)\n", iface, This, frame); - child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); - if (!child) return D3DRMERR_BADOBJECT;

1 0

Christian Costa : dmsynth: Display new ref in trace for AddRef and Release.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 90085afebf8966dbc2bb17fc645e8397d5cdb2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90085afebf8966dbc2bb17fc6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:53:34 2012 +0200 dmsynth: Display new ref in trace for AddRef and Release. --- dlls/dmsynth/synth.c | 32 ++++++++++++++++---------------- dlls/dmsynth/synthsink.c | 30 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 9c088af..657f3bd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -59,32 +59,32 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); + DMSYNTH_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - if (This->pLatencyClock) - IReferenceClock_Release(This->pLatencyClock); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + if (This->pLatencyClock) + IReferenceClock_Release(This->pLatencyClock); + HeapFree(GetProcessHeap(), 0, This); + } - DMSYNTH_UnlockModule(); - - return refCount; + DMSYNTH_UnlockModule(); + + return ref; } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index e5e164f..42c2d4c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -53,32 +53,32 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); + DMSYNTH_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - if (This->latency_clock) - IReferenceClock_Release(This->latency_clock); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); + HeapFree(GetProcessHeap(), 0, This); + } - DMSYNTH_UnlockModule(); + DMSYNTH_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */

1 0

Piotr Caban : comctl32: LVM_SETITEMTEXT is not supported on LVS_OWNERDATA.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 8276a3375b653cec5df2f823bf5b5ae08550152f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8276a3375b653cec5df2f823b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 10 11:19:37 2012 +0200 comctl32: LVM_SETITEMTEXT is not supported on LVS_OWNERDATA. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ccabe6b..e507848 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8896,6 +8896,7 @@ static BOOL LISTVIEW_SetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE LVITEMW lvItem; if (!lpLVItem || nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE; + if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE; lvItem.iItem = nItem; lvItem.iSubItem = lpLVItem->iSubItem; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c38bb61..b96e85f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2627,6 +2627,8 @@ static void test_sorting(void) static void test_ownerdata(void) { + static char test_str[] = "test"; + HWND hwnd; LONG_PTR style, ret; DWORD res; @@ -2711,7 +2713,7 @@ static void test_ownerdata(void) expect(1, res); DestroyWindow(hwnd); - /* LVM_SETITEM is unsupported on LVS_OWNERDATA */ + /* LVM_SETITEM and LVM_SETITEMTEXT is unsupported on LVS_OWNERDATA */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); @@ -2725,6 +2727,10 @@ static void test_ownerdata(void) item.state = LVIS_SELECTED; res = SendMessageA(hwnd, LVM_SETITEM, 0, (LPARAM)&item); expect(FALSE, res); + memset(&item, 0, sizeof(item)); + item.pszText = test_str; + res = SendMessageA(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&item); + expect(FALSE, res); DestroyWindow(hwnd); /* check notifications after focused/selected changed */

1 0

Piotr Caban : comctl32: Make icons not overlapping in LVS_ICON mode.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 25f347892e05da184d871ab23f1cb81a7869fa32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f347892e05da184d871ab23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 10 11:01:46 2012 +0200 comctl32: Make icons not overlapping in LVS_ICON mode. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e507848..7111560 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8564,10 +8564,12 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING); /* if 0 then compute width - * FIXME: Should scan each item and determine max width of - * icon or label, then make that the width */ - if (cx == 0) - cx = infoPtr->iconSpacing.cx; + * FIXME: computed cx and cy is not matching native behaviour */ + if (cx == 0) { + cx = GetSystemMetrics(SM_CXICONSPACING); + if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx) + cx = infoPtr->iconSize.cx + ICON_LR_PADDING; + } /* if 0 then compute height */ if (cy == 0)

1 0