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

Michael Stefaniuc : shell32: Pass object pointers instead of ifaces to internal helpers.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d06bf13a6dbf96993b497f0ea7c8f8f0ec97b9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06bf13a6dbf96993b497f0ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:45:04 2011 +0200 shell32: Pass object pointers instead of ifaces to internal helpers. --- dlls/shell32/shv_item_cmenu.c | 44 +++++++++++++--------------------------- 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index e5d5e5b..bf00e70 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -267,13 +267,8 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( * for folders only */ -static void DoOpenExplore( - IContextMenu2 *iface, - HWND hwnd, - LPCSTR verb) +static void DoOpenExplore(ItemCmImpl *This, HWND hwnd, LPCSTR verb) { - ItemCmImpl *This = (ItemCmImpl *)iface; - UINT i, bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei; @@ -309,12 +304,8 @@ static void DoOpenExplore( /************************************************************************** * DoRename */ -static void DoRename( - IContextMenu2 *iface, - HWND hwnd) +static void DoRename(ItemCmImpl *This, HWND hwnd) { - ItemCmImpl *This = (ItemCmImpl *)iface; - LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; @@ -338,9 +329,8 @@ static void DoRename( * * deletes the currently selected items */ -static void DoDelete(IContextMenu2 *iface) +static void DoDelete(ItemCmImpl *This) { - ItemCmImpl *This = (ItemCmImpl *)iface; ISFHelper * psfhlp; IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); @@ -356,13 +346,8 @@ static void DoDelete(IContextMenu2 *iface) * * copies the currently selected items into the clipboard */ -static BOOL DoCopyOrCut( - IContextMenu2 *iface, - HWND hwnd, - BOOL bCut) +static BOOL DoCopyOrCut(ItemCmImpl *This, HWND hwnd, BOOL bCut) { - ItemCmImpl *This = (ItemCmImpl *)iface; - LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; LPDATAOBJECT lpDo; @@ -402,9 +387,8 @@ static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) /************************************************************************** * DoOpenProperties */ -static void DoOpenProperties(IContextMenu2 *iface, HWND hwnd) +static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) { - ItemCmImpl *This = (ItemCmImpl *)iface; static const UINT MAX_PROP_PAGES = 99; static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0}; static const WCHAR wszFiletypeAll[] = {'*',0}; @@ -534,31 +518,31 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); - DoOpenExplore(iface, lpcmi->hwnd, "explore"); + DoOpenExplore(This, lpcmi->hwnd, "explore"); break; case FCIDM_SHVIEW_OPEN: TRACE("Verb FCIDM_SHVIEW_OPEN\n"); - DoOpenExplore(iface, lpcmi->hwnd, "open"); + DoOpenExplore(This, lpcmi->hwnd, "open"); break; case FCIDM_SHVIEW_RENAME: TRACE("Verb FCIDM_SHVIEW_RENAME\n"); - DoRename(iface, lpcmi->hwnd); + DoRename(This, lpcmi->hwnd); break; case FCIDM_SHVIEW_DELETE: TRACE("Verb FCIDM_SHVIEW_DELETE\n"); - DoDelete(iface); + DoDelete(This); break; case FCIDM_SHVIEW_COPY: TRACE("Verb FCIDM_SHVIEW_COPY\n"); - DoCopyOrCut(iface, lpcmi->hwnd, FALSE); + DoCopyOrCut(This, lpcmi->hwnd, FALSE); break; case FCIDM_SHVIEW_CUT: TRACE("Verb FCIDM_SHVIEW_CUT\n"); - DoCopyOrCut(iface, lpcmi->hwnd, TRUE); + DoCopyOrCut(This, lpcmi->hwnd, TRUE); break; case FCIDM_SHVIEW_PROPERTIES: TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); - DoOpenProperties(iface, lpcmi->hwnd); + DoOpenProperties(This, lpcmi->hwnd); break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); @@ -569,9 +553,9 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( { TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) - DoDelete(iface); + DoDelete(This); else if (strcmp(lpcmi->lpVerb,"properties")==0) - DoOpenProperties(iface, lpcmi->hwnd); + DoOpenProperties(This, lpcmi->hwnd); else { FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); return E_FAIL;

1 0

Michael Stefaniuc : shell32: COM cleanup for the IContextMenu2 iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c40a6eee4c56da1b3002ed35ffde07511ee3d5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40a6eee4c56da1b3002ed35f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:47:45 2011 +0200 shell32: COM cleanup for the IContextMenu2 iface. --- dlls/shell32/shv_item_cmenu.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index bf00e70..62c4c7f 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -46,7 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); * IContextMenu Implementation */ typedef struct -{ const IContextMenu2Vtbl *lpVtbl; +{ + IContextMenu2 IContextMenu2_iface; LONG ref; IShellFolder* pSFParent; LPITEMIDLIST pidl; /* root pidl */ @@ -55,6 +56,11 @@ typedef struct BOOL bAllValues; } ItemCmImpl; +static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return CONTAINING_RECORD(iface, ItemCmImpl, IContextMenu2_iface); +} + static const IContextMenu2Vtbl cmvt; @@ -86,7 +92,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl UINT u; cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ItemCmImpl)); - cm->lpVtbl = &cmvt; + cm->IContextMenu2_iface.lpVtbl = &cmvt; cm->ref = 1; cm->pidl = ILClone(pidl); cm->pSFParent = pSFParent; @@ -104,7 +110,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl TRACE("(%p)->()\n",cm); - return (IContextMenu2*)cm; + return &cm->IContextMenu2_iface; } /************************************************************************** @@ -112,7 +118,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl */ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -144,7 +150,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri */ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -157,7 +163,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) */ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -217,7 +223,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); INT uIDMax; TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -499,7 +505,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) FIXME("Is an EX structure\n"); @@ -575,7 +581,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); HRESULT hr = E_INVALIDARG; @@ -630,7 +636,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( WPARAM wParam, LPARAM lParam) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IDXGIOutput iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 125b949545e19725740eed41390a092c6ca21d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b949545e19725740eed413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 10:21:49 2011 +0200 dxgi: COM cleanup for the IDXGIOutput iface. --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cd808f..d4f757b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -228,7 +228,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent return E_OUTOFMEMORY; } dxgi_output_init(output, adapter); - adapter->output = (IDXGIOutput *)output; + adapter->output = &output->IDXGIOutput_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index cb472f3..741e3e3 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,7 +102,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - const struct IDXGIOutputVtbl *vtbl; + IDXGIOutput IDXGIOutput_iface; LONG refcount; struct dxgi_adapter *adapter; }; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5ab7992..acc9f25 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, REFIID riid, void **object) @@ -46,7 +51,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -56,7 +61,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -98,7 +103,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -117,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); enum wined3d_format_id wined3d_format; struct wined3d *wined3d; UINT i; @@ -279,7 +284,7 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { - output->vtbl = &dxgi_output_vtbl; + output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->adapter = adapter; }

1 0

Michael Stefaniuc : dxgi: COM cleanup in the IDXGISwapChain iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 61f51eb47ecde08f9d1f6e60b1261e52f029a67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f51eb47ecde08f9d1f6e60b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 10:25:49 2011 +0200 dxgi: COM cleanup in the IDXGISwapChain iface. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 741e3e3..98fdea8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -124,7 +124,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent /* IDXGISwapChain */ struct dxgi_swapchain { - const struct IDXGISwapChainVtbl *vtbl; + IDXGISwapChain IDXGISwapChain_iface; LONG refcount; struct wined3d_swapchain *wined3d_swapchain; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e4f7433..373403c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_QueryInterface(IDXGISwapChain *i static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -61,7 +66,7 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -130,7 +135,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags); @@ -143,7 +148,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, U static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, UINT buffer_idx, REFIID riid, void **surface) { - struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); struct wined3d_surface *backbuffer; IUnknown *parent; HRESULT hr; @@ -271,7 +276,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device { HRESULT hr; - swapchain->vtbl = &dxgi_swapchain_vtbl; + swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; hr = wined3d_swapchain_create(device->wined3d_device, present_parameters,

1 0

Aric Stewart : usp10: Correct indic vowel marker name.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 7ab744d3c76ba72b05d181524775a2428a6e7a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab744d3c76ba72b05d181524… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 07:28:54 2011 -0500 usp10: Correct indic vowel marker name. --- dlls/usp10/indic.c | 20 +++--- dlls/usp10/shape.c | 152 +++++++++++++++++++++--------------------- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ab744d3c76ba72b05d18…

1 0

Aric Stewart : gdi32: Fall back on uniscribe for complex scripts.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 0a29308e87780a7f0f6c5504ad80768443166cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a29308e87780a7f0f6c5504a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 07:43:07 2011 -0500 gdi32: Fall back on uniscribe for complex scripts. --- dlls/gdi32/bidi.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 297ce86..9b8f758 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -359,6 +359,7 @@ BOOL BIDI_Reorder( WORD *chartype; BYTE *levels; unsigned i, done, glyph_i; + BOOL is_complex; int maxItems; int nItems; @@ -404,11 +405,20 @@ BOOL BIDI_Reorder( if (lpOutString) memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + is_complex = FALSE; + for (i = 0; i < uCount && !is_complex; i++) + { + if ((lpString[i] >= 0x900 && lpString[i] <= 0xfff) || + (lpString[i] >= 0x1cd0 && lpString[i] <= 0x1cff) || + (lpString[i] >= 0xa840 && lpString[i] <= 0xa8ff)) + is_complex = TRUE; + } + /* Verify reordering will be required */ if ((WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) || ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL)) State.uBidiLevel = 1; - else + else if (!is_complex) { done = 1; classify(lpString, chartype, uCount);

1 0

Andrew Eikum : winealsa.drv: Partially implement IAudioSessionManager2.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 6dac4d713ce9b3530d9d663bac753bcd5b200381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dac4d713ce9b3530d9d663ba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:13 2011 -0500 winealsa.drv: Partially implement IAudioSessionManager2. --- dlls/winealsa.drv/mmdevdrv.c | 308 ++++++++++++++++++++++++++++------ dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 254 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dac4d713ce9b3530d9d6…

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in monthcal tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 589d87f215d7b8c76b42a795e4b7d13d207e08b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589d87f215d7b8c76b42a795e… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jun 4 23:27:33 2011 +0200 comctl32/tests: Removed sign comparison warning in monthcal tests. --- dlls/comctl32/tests/monthcal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f585376..83b789d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -581,9 +581,9 @@ static void test_color(void) /* invalid color index */ color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_TRAILINGTEXT + 1, 0); - expect(-1, color); + expect(~0u, color); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_TRAILINGTEXT + 1, RGB(255,255,255)); - expect(-1, prev); + expect(~0u, prev); color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_BACKGROUND, 0); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_BACKGROUND, RGB(0,0,0)); @@ -920,11 +920,11 @@ static void test_hittest(void) res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect(0, mchit.pt.x); expect(0, mchit.pt.y); - expect(-1, res); + expect(~0u, res); expect(0, mchit.uHit); /* test with invalid pointer */ res = SendMessage(hwnd, MCM_HITTEST, 0, 0); - expect(-1, res); + expect(~0u, res); /* resize control to display single Calendar */ res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); @@ -1655,7 +1655,7 @@ static void test_hittest_v6(void) mchit.iRow = -1; mchit.iCol = -1; ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); - if (ret == -1) + if (ret == ~0u) { win_skip("Only MCHITTESTINFO_V1 supported\n"); DestroyWindow(hwnd);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in listview tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 38bf3a6bbd2461d0e3923b364e8253e8380bd406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf3a6bbd2461d0e3923b364… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 01:36:55 2011 +0200 comctl32/tests: Removed sign comparison warning in listview tests. --- dlls/comctl32/tests/listview.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 949b214..e0dfd72 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -662,7 +662,7 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN BOOL todo_item, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -705,7 +705,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi BOOL todo_item, BOOL todo_subitem, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -748,7 +748,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi static void test_images(void) { HWND hwnd; - DWORD r; + INT r; LVITEM item; HIMAGELIST himl; HBITMAP hbmp; @@ -1018,7 +1018,7 @@ static void test_checkboxes(void) static void insert_column(HWND hwnd, int idx) { LVCOLUMN column; - DWORD rc; + INT rc; memset(&column, 0xcc, sizeof(column)); column.mask = LVCF_SUBITEM; @@ -1033,7 +1033,7 @@ static void insert_item(HWND hwnd, int idx) static CHAR text[] = "foo"; LVITEMA item; - DWORD rc; + INT rc; memset(&item, 0xcc, sizeof (item)); item.mask = LVIF_TEXT; @@ -1701,7 +1701,7 @@ static void test_icon_spacing(void) HWND hwnd; WORD w, h; - DWORD r; + INT r; hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2017,7 +2017,7 @@ static void test_multiselect(void) } select_task; HWND hwnd; - DWORD r; + INT r; int i,j,item_count,selected_count; static const int items=5; BYTE kstate[256]; @@ -2393,7 +2393,7 @@ static void test_sorting(void) { HWND hwnd; LVITEMA item = {0}; - DWORD r; + INT r; LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; @@ -3633,7 +3633,7 @@ static void test_editbox(void) static CHAR buffer[25]; HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; - DWORD r; + INT r; hwnd = create_listview_control(LVS_EDITLABELS | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -4128,7 +4128,7 @@ static void test_canceleditlabel(void) static void test_mapidindex(void) { HWND hwnd; - DWORD ret; + INT ret; /* LVM_MAPINDEXTOID unsupported with LVS_OWNERDATA */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4250,7 +4250,7 @@ todo_wine { static void test_getcolumnwidth(void) { HWND hwnd; - DWORD ret; + INT ret; DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; @@ -4442,7 +4442,7 @@ static void test_finditem(void) LVFINDINFOA fi; static char f[5]; HWND hwnd; - DWORD r; + INT r; hwnd = create_listview_control(LVS_REPORT); insert_item(hwnd, 0);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in imagelist tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 7399177f0bb408fa7fb84ec2b77a8f97bbb1ee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7399177f0bb408fa7fb84ec2b… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 15:35:32 2011 +0200 comctl32/tests: Removed sign comparison warning in imagelist tests. --- dlls/comctl32/tests/imagelist.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index cc98a17..46b3595 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -893,7 +893,8 @@ static void image_list_init(HIMAGELIST himl) { HBITMAP hbm; char comment[16]; - INT n = 1, i; + INT n = 1; + DWORD i; static const struct test_data { BYTE grey; @@ -1757,15 +1758,15 @@ static void test_iconsize(void) ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ - cx = 0xdeadbeef; + cx = 0x1abe11ed; ret = ImageList_GetIconSize(himl, &cx, NULL); ok(!ret, "got %d\n", ret); - ok(cx == 0xdeadbeef, "got %d\n", cx); + ok(cx == 0x1abe11ed, "got %d\n", cx); - cy = 0xdeadbeef; + cy = 0x1abe11ed; ret = ImageList_GetIconSize(himl, NULL, &cy); ok(!ret, "got %d\n", ret); - ok(cy == 0xdeadbeef, "got %d\n", cy); + ok(cy == 0x1abe11ed, "got %d\n", cy); ImageList_Destroy(himl); }

1 0