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

André Hentschel : mscoree/tests: Broken return value is a HRESULT_FROM_WIN32.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 79a51533661e4a65d63002c9953a247d760b7f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a51533661e4a65d63002c99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:00 2011 +0200 mscoree/tests: Broken return value is a HRESULT_FROM_WIN32. --- dlls/mscoree/tests/mscoree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 308db41..3ef9bd8 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -287,7 +287,8 @@ static void test_createconfigstream(void) GetFullPathNameW(file, MAX_PATH, path, NULL); hr = pCreateConfigStream(NULL, &stream); - todo_wine ok(hr == E_FAIL || broken(hr == ERROR_PROC_NOT_FOUND), /* some WinXP, Win2K3 and Win7 */ + todo_wine ok(hr == E_FAIL || + broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)), /* some WinXP, Win2K3 and Win7 */ "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL);

1 0

Andrew Nguyen : d3d9: Increment the reference count of the IDirect3D9 parent when creating a device .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 94785ab4d57ccc7cce08f77a2db7576197b9fd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94785ab4d57ccc7cce08f77a2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:23:27 2011 -0500 d3d9: Increment the reference count of the IDirect3D9 parent when creating a device. --- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 27 +++++++-------------------- dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/tests/device.c | 12 ++++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 23e7f00..87ff3fd 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -166,6 +166,7 @@ typedef struct IDirect3DDevice9Impl struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + IDirect3D9Ex *d3d_parent; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; @@ -175,7 +176,7 @@ typedef struct IDirect3DDevice9Impl BOOL notreset; } IDirect3DDevice9Impl; -HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, +HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; /***************************************************************************** diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a95fa16..2e4ca5d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -265,6 +265,8 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(IDirect3DDevi wined3d_device_decref(This->wined3d_device); wined3d_mutex_unlock(); + IDirect3D9_Release(This->d3d_parent); + HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -317,8 +319,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface IDirect3D9 **ppD3D9) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d *wined3d; - HRESULT hr = D3D_OK; TRACE("iface %p, d3d9 %p.\n", iface, ppD3D9); @@ -326,23 +326,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } - wined3d_mutex_lock(); - hr = wined3d_device_get_wined3d(This->wined3d_device, &wined3d); - if (hr == D3D_OK && wined3d) - { - *ppD3D9 = wined3d_get_parent(wined3d); - IDirect3D9_AddRef(*ppD3D9); - wined3d_decref(wined3d); - } - else - { - FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); - *ppD3D9 = NULL; - } - TRACE("(%p) returning %p\n", This, *ppD3D9); - wined3d_mutex_unlock(); - - return hr; + return IDirect3D9Ex_QueryInterface(This->d3d_parent, &IID_IDirect3D9, (void **)ppD3D9); } static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *pCaps) @@ -3347,7 +3331,7 @@ static void setup_fpu(void) #endif } -HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, +HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { WINED3DPRESENT_PARAMETERS *wined3d_parameters; @@ -3483,5 +3467,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT return E_OUTOFMEMORY; } + device->d3d_parent = &parent->IDirect3D9Ex_iface; + IDirect3D9_AddRef(device->d3d_parent); + return D3D_OK; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 791d835..148b9b7 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -449,7 +449,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex return E_OUTOFMEMORY; } - hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL); + hr = device_init(object, This, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); @@ -507,7 +507,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3 return E_OUTOFMEMORY; } - hr = device_init(object, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode); + hr = device_init(object, d3d9, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1a74d6e..235b06f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -423,6 +423,7 @@ static void test_refcount(void) HRESULT hr; HWND hwnd = NULL; IDirect3D9 *pD3d = NULL; + IDirect3D9 *pD3d2 = NULL; IDirect3DDevice9 *pDevice = NULL; IDirect3DVertexBuffer9 *pVertexBuffer = NULL; IDirect3DIndexBuffer9 *pIndexBuffer = NULL; @@ -467,6 +468,8 @@ static void test_refcount(void) ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; + CHECK_REFCOUNT( pD3d, 1 ); + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.Windowed = TRUE; @@ -484,6 +487,15 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + CHECK_REFCOUNT( pD3d, 2 ); + + hr = IDirect3DDevice9_GetDirect3D(pDevice, &pD3d2); + CHECK_CALL( hr, "GetDirect3D", pDevice, refcount ); + + ok(pD3d2 == pD3d, "Expected IDirect3D9 pointers to be equal\n"); + CHECK_REFCOUNT( pD3d, 3 ); + CHECK_RELEASE_REFCOUNT( pD3d, 2 ); + /** * Check refcount of implicit surfaces and implicit swapchain. Findings: * - the container is the device OR swapchain

1 0

André Hentschel : mscoree/tests: Test more IStream Functions on a ConfigStream.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 2061c61c4e8a00d7ea11c9a4961fb738efe0e58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2061c61c4e8a00d7ea11c9a49… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:09 2011 +0200 mscoree/tests: Test more IStream Functions on a ConfigStream. --- dlls/mscoree/tests/mscoree.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3ef9bd8..3731f6f 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -274,7 +274,6 @@ static void test_createconfigstream(void) WCHAR nonexistent[] = {'n', 'o', 'n', 'e', 'x', 'i', 's', 't', '.', 'x', 'm', 'l', 0}; WCHAR path[MAX_PATH]; HRESULT hr; - ULONG ret; char buffer[256] = {0}; if (!pCreateConfigStream) @@ -308,14 +307,37 @@ static void test_createconfigstream(void) if (stream) { DWORD count; + LARGE_INTEGER pos; + ULARGE_INTEGER size; + IStream *stream2 = NULL; - hr = IStream_Read(stream, &buffer, strlen(xmldata), &count); + hr = IStream_Read(stream, buffer, strlen(xmldata), &count); ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); ok(count == strlen(xmldata), "wrong count: %u\n", count); ok(!strcmp(buffer, xmldata), "Strings do not match\n"); - ret = IStream_Release(stream); - ok(!ret, "ret=%d\n", ret); + hr = IStream_Write(stream, xmldata, strlen(xmldata), &count); + ok(hr == E_FAIL, "IStream_Write returned hr=%x\n", hr); + + pos.QuadPart = strlen(xmldata); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == E_NOTIMPL, "IStream_Seek returned hr=%x\n", hr); + + size.QuadPart = strlen(xmldata); + hr = IStream_SetSize(stream, size); + ok(hr == E_NOTIMPL, "IStream_SetSize returned hr=%x\n", hr); + + hr = IStream_Clone(stream, &stream2); + ok(hr == E_NOTIMPL, "IStream_Clone returned hr=%x\n", hr); + + hr = IStream_Commit(stream, STGC_DEFAULT); + ok(hr == E_NOTIMPL, "IStream_Commit returned hr=%x\n", hr); + + hr = IStream_Revert(stream); + ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%x\n", hr); + + hr = IStream_Release(stream); + ok(hr == S_OK, "IStream_Release returned hr=%x\n", hr); } DeleteFileW(file); }

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in rebar tests.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 909794a2cb2ebd61e1ea51c20e0a155fd9c0db20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909794a2cb2ebd61e1ea51c20… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jun 3 16:23:32 2011 +0200 comctl32/tests: Removed sign comparison warning in rebar tests. --- dlls/comctl32/tests/rebar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d9ceb71..5efe940 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -194,7 +194,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; DWORD fStyle; - INT cx; + UINT cx; } rbband_result_t; typedef struct { @@ -225,7 +225,7 @@ static void rbsize_add_row(rbsize_result_t *rbsr, int rowHeight) { rbsr->nRows++; } -static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, INT cx) +static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, UINT cx) { SetRect(&(rbsr->bands[rbsr->nBands].rc), left, top, right, bottom); rbsr->bands[rbsr->nBands].fStyle = fStyle; @@ -810,7 +810,7 @@ static const rbresize_test_result_t resize_results[] = { {{-2, 0, 674, 24}, 0, FALSE}, }; -static int resize_numtests = 0; +static DWORD resize_numtests = 0; #define comment(fmt, arg1) #define check_client() { \ @@ -894,7 +894,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, - INT cxHeader, INT cxHeader_broken) + UINT cxHeader, UINT cxHeader_broken) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFOA rb;

1 0

Aric Stewart : usp10: Don' t return prematurely from Chaining Contextual Substitution.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 1e115d65e09e44300481d9431da97c14d67c8449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e115d65e09e44300481d9431… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 09:08:03 2011 -0500 usp10: Don't return prematurely from Chaining Contextual Substitution. --- dlls/usp10/shape.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 45492f7..5ee0b6d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -969,12 +969,12 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); - return -1; + continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); - return -1; + continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { @@ -997,7 +997,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)) - return -1; + continue; TRACE("Matched Backtrack\n"); ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); @@ -1010,7 +1010,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != indexGlyphs) - return -1; + continue; TRACE("Matched IndexGlyphs\n"); ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); @@ -1022,7 +1022,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU break; } if (k != GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)) - return -1; + continue; TRACE("Matched LookAhead\n"); ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); @@ -1037,7 +1037,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU if (newIndex == -1) { ERR("Chain failed to generate a glyph\n"); - return -1; + continue; } } return newIndex + 1;

1 0

Andrew Eikum : winealsa.drv: Partially implement IAudioSessionManager2.
by Alexandre Julliard June 6, 2011

June 6, 2011

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

Michael Stefaniuc : inetcomm: Rename a typedef to prevent it from being shadowed.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: a052e29556f975c3e8bb78bcde7042d2b9b63acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a052e29556f975c3e8bb78bcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:39:17 2011 +0200 inetcomm: Rename a typedef to prevent it from being shadowed. --- dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 97b482e..187f1c5 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -56,11 +56,11 @@ typedef struct struct list charsets; LONG next_charset_handle; HCHARSET default_charset; -} internat; +} internat_impl; -static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) { - return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); + return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); return InterlockedIncrement(&This->refs); } static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); ULONG refs; refs = InterlockedDecrement(&This->refs); @@ -112,7 +112,7 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); TRACE("(%p)->(%p)\n", iface, hCharset); @@ -126,7 +126,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", iface, phCharset); @@ -238,7 +238,7 @@ static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSE static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_NOT_FOUND; charset_entry *charset; @@ -278,7 +278,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, LPINETCSETINFO pCsetInfo) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_INVALID_HANDLE; charset_entry *charset; @@ -519,7 +519,7 @@ static IMimeInternationalVtbl mime_internat_vtbl = MimeInternat_Rfc1522Encode }; -static internat *global_internat; +static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) {

1 0

Michael Stefaniuc : shell32: Pass object pointers instead of ifaces to internal helpers.
by Alexandre Julliard June 6, 2011

June 6, 2011

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

Aric Stewart : usp10: Correct indic vowel marker name.
by Alexandre Julliard June 6, 2011

June 6, 2011

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

Michael Stefaniuc : dxgi: COM cleanup in the IDXGISwapChain iface.
by Alexandre Julliard June 6, 2011

June 6, 2011

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