January 2012 - Wine-commits

André Hentschel : ntdll: No need for WINE_ prefixed debug output macro.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 37ba5eb2a2231e270c038376b6f32ed83d2f4429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ba5eb2a2231e270c038376b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:29:26 2012 +0100 ntdll: No need for WINE_ prefixed debug output macro. --- dlls/ntdll/signal_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6f9b9bf..7514b4d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -577,7 +577,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - WINE_ERR( "Got unexpected trap %ld\n", TRAP_sig(context) ); + ERR("Got unexpected trap %ld\n", TRAP_sig(context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; }

1 0

André Hentschel : ole32: No need for WINE_ prefixed debug output macro.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 0d23c1d4644b10405d1fc9093cb74ee6b63948b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d23c1d4644b10405d1fc9093… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:29:40 2012 +0100 ole32: No need for WINE_ prefixed debug output macro. --- dlls/ole32/comcat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index b3cd889..b10075b 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -596,7 +596,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories( struct class_categories *categories; HKEY key; - if (WINE_TRACE_ON(ole)) { + if (TRACE_ON(ole)) { ULONG count; TRACE("CLSID: %s Implemented %u\n",debugstr_guid(rclsid),cImplemented); for (count = 0; count < cImplemented; ++count)

1 0

André Hentschel : user32: No need for WINE_ prefixed debug output macro.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 49034716ce1d99143e0f63eb60cef141e62b554a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49034716ce1d99143e0f63eb6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:30:53 2012 +0100 user32: No need for WINE_ prefixed debug output macro. --- dlls/user32/winhelp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index 1ffb707..a2c331b 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -152,9 +152,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->ofsData = sizeof(WINHELP) + nlen; } else lpwh->ofsData = 0; - WINE_TRACE("Sending[%u]: cmd=%u data=%08x fn=%s\n", - lpwh->size, lpwh->command, lpwh->data, - lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); + TRACE("Sending[%u]: cmd=%u data=%08x fn=%s\n", + lpwh->size, lpwh->command, lpwh->data, + lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); return SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); }

1 0

André Hentschel : winex11.drv: No need for WINE_ prefixed debug output macros.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 4c6a20ce222422222b79c3c9358cc02a94f2306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a20ce222422222b79c3c93… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:31:28 2012 +0100 winex11.drv: No need for WINE_ prefixed debug output macros. --- dlls/winex11.drv/systray.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 7d5a0e9..0a581f3 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -367,7 +367,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR struct tray_icon *icon = NULL; BOOL ret; - WINE_TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); + TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); /* set the icon data for the window from the data passed into CreateWindow */ if (msg == WM_NCCREATE) @@ -661,17 +661,17 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) { struct tray_icon *icon; - WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); + TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); if ((icon = get_icon(nid->hWnd, nid->uID))) { - WINE_WARN("duplicate tray icon add, buggy app?\n"); + WARN("duplicate tray icon add, buggy app?\n"); return FALSE; } if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { - WINE_ERR("out of memory\n"); + ERR("out of memory\n"); return FALSE; }

1 0

André Hentschel : xcopy: Fix a typo.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: fd4afaf639e7a46fe1801fbfa7d59944ffcb32e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4afaf639e7a46fe1801fbfa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 23:40:09 2012 +0100 xcopy: Fix a typo. --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f1c011f..03eb899 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -787,7 +787,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, if (*pos++ != '-') isError = TRUE; } - /* Parse the arg : Day */ + /* Parse the arg : Year */ if (!isError) { st.wYear = _wtol(pos); while (*pos && isdigit(*pos)) pos++;

1 0

Nikolay Sivov : msxml3: Try mshtml container url as a base for relative request url.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 9b1f217c4119367e5d7cf023e534c5724606f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1f217c4119367e5d7cf023e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 05:19:48 2012 +0300 msxml3: Try mshtml container url as a base for relative request url. --- dlls/msxml3/httprequest.c | 46 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 16 +++++++++++++- dlls/uuid/uuid.c | 5 +++- include/docobj.idl | 2 + 4 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 79bf34d..ff4ab21 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -33,10 +33,16 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "wininet.h" +#include "winreg.h" #include "winuser.h" #include "ole2.h" +#include "mshtml.h" #include "msxml6.h" #include "objsafe.h" +#include "docobj.h" +#include "shlwapi.h" #include "msxml_private.h" @@ -72,6 +78,7 @@ typedef struct /* request */ BINDVERB verb; BSTR custom; + BSTR siteurl; BSTR url; BOOL async; struct list reqheaders; @@ -767,6 +774,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) IUnknown_Release( This->site ); SysFreeString(This->custom); + SysFreeString(This->siteurl); SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); @@ -906,7 +914,22 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR return E_FAIL; } - This->url = SysAllocString(url); + /* try to combine with site url */ + if (This->siteurl && PathIsRelativeW(url)) + { + DWORD len = INTERNET_MAX_URL_LENGTH; + WCHAR *fullW = heap_alloc(len*sizeof(WCHAR)); + + hr = UrlCombineW(This->siteurl, url, fullW, &len, 0); + if (hr == S_OK) + { + TRACE("combined url %s\n", debugstr_w(fullW)); + This->url = SysAllocString(fullW); + } + heap_free(fullW); + } + else + This->url = SysAllocString(url); VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); @@ -1324,6 +1347,8 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { httprequest *This = impl_from_IObjectWithSite(iface); + IServiceProvider *provider; + HRESULT hr; TRACE("(%p)->(%p)\n", iface, punk); @@ -1335,6 +1360,23 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface This->site = punk; + hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); + if (hr == S_OK) + { + IHTMLDocument2 *doc; + + hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + if (hr == S_OK) + { + SysFreeString(This->siteurl); + + hr = IHTMLDocument2_get_URL(doc, &This->siteurl); + IHTMLDocument2_Release(doc); + TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); + } + IServiceProvider_Release(provider); + } + return S_OK; } @@ -1426,7 +1468,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->async = FALSE; req->verb = -1; req->custom = NULL; - req->url = req->user = req->password = NULL; + req->url = req->siteurl = req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED; req->sink = NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5ed8715..a4e5ab1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5000,11 +5000,11 @@ todo_wine { hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); EXPECT_HR(hr, S_OK); -todo_wine{ CHECK_CALLED(site_qi_IServiceProvider); - +todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); +todo_wine { CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable @@ -5019,11 +5019,23 @@ todo_wine{ } IObjectWithSite_Release(obj_site); + /* try to set site another time */ + + /* to be removed once IObjectWithSite is properly separated */ + SET_EXPECT(site_qi_IServiceProvider); + SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); + + hr = IObjectWithSite_SetSite(obj_site2, &testsite.IUnknown_iface); + EXPECT_HR(hr, S_OK); + todo_wine EXPECT_REF(xhr, 1); IXMLHttpRequest_Release(xhr); /* still works after request is released */ + + /* to be removed once IObjectWithSite is properly separated */ SET_EXPECT(site_qi_IServiceProvider); + SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); hr = IObjectWithSite_SetSite(obj_site2, &testsite.IUnknown_iface); EXPECT_HR(hr, S_OK); diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 3318dd6..25e98a7 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -126,7 +126,7 @@ DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x4 DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); -DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); +DEFINE_GUID(GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71a5b253,0x1951,0x466b,0x9f,0xbc,0x9c,0x88,0x08,0xfa,0x84,0xf2); DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273aad,0x01bb,0x4164,0x95,0xc6,0x75,0x5b,0xa0,0xb5,0x16,0x2d); DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xf9ae2c6b,0x1866,0x4361,0xaf,0x72,0x7a,0xa3,0x09,0x48,0x89,0x0e); @@ -136,3 +136,6 @@ DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2a54fe8e,0x0d08,0x460c,0xa DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); + +/* service identifiers not declared in headers */ +DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); diff --git a/include/docobj.idl b/include/docobj.idl index bc14b1d..c77e546 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -407,3 +407,5 @@ cpp_quote("#define IID_IMsoDocumentSite IID_IOleDocumentSite") cpp_quote("#define IID_IMsoView IID_IOleDocumentView") cpp_quote("#define IID_IEnumMsoView IID_IEnumOleDocumentViews") cpp_quote("#define IID_IMsoCommandTarget IID_IOleCommandTarget") + +cpp_quote("EXTERN_C const GUID SID_SContainerDispatch;")

1 0

Austin English : wine.inf: Add Tcpip/Winsock/Winsock2 service registry keys .
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: a2219b9c841a7002d1528c613a7bc4439f14a509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2219b9c841a7002d1528c613… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 10 19:51:25 2012 -0800 wine.inf: Add Tcpip/Winsock/Winsock2 service registry keys. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index bc7d673..3ea3025 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3048,6 +3048,9 @@ ErrorControl=1 [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters" +HKLM,"System\CurrentControlSet\Services\Winsock\Parameters" +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Nikolay Sivov : shell32: Merge menu implementations together.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: dff08c977105999ee1ce0c741a7ad3d528f0693f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff08c977105999ee1ce0c741… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 03:45:28 2012 +0300 shell32: Merge menu implementations together. --- dlls/shell32/shlview_cmenu.c | 443 ++++++++++++++++++++---------------------- 1 files changed, 214 insertions(+), 229 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dff08c977105999ee1ce0…

1 0

Nikolay Sivov : shell32: Get rid of menu enabling helper.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: bfc39c83b536fc052f97be4881e4c2eb2761f32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc39c83b536fc052f97be488… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 03:51:14 2012 +0300 shell32: Get rid of menu enabling helper. --- dlls/shell32/shlview_cmenu.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3bcf701..3c3f369 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -66,20 +66,6 @@ static inline ContextMenu *impl_from_IContextMenu2(IContextMenu2 *iface) return CONTAINING_RECORD(iface, ContextMenu, IContextMenu2_iface); } -static BOOL ItemMenu_CanRenameItems(ContextMenu *This) -{ - DWORD attr; - - TRACE("(%p)\n", This); - - /* can't rename more than one item at a time*/ - if (!This->apidl || This->cidl > 1) return FALSE; - - attr = SFGAO_CANRENAME; - IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); - return attr & SFGAO_CANRENAME; -} - static HRESULT WINAPI ItemMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { ContextMenu *This = impl_from_IContextMenu2(iface); @@ -189,7 +175,22 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( if(uFlags & ~CMF_CANRENAME) RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); else - EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND | ItemMenu_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); + { + UINT enable = MF_BYCOMMAND; + + /* can't rename more than one item at a time*/ + if (!This->apidl || This->cidl > 1) + enable |= MFS_DISABLED; + else + { + DWORD attr = SFGAO_CANRENAME; + + IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; + } + + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); + } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); }

1 0

Nikolay Sivov : shell32: Use shared IUnknown implementation for both vtables.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 82c72f2fae591c98e3364adb74dc1fbed8477169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c72f2fae591c98e3364adb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 03:58:33 2012 +0300 shell32: Use shared IUnknown implementation for both vtables. --- dlls/shell32/shlview_cmenu.c | 74 +++++------------------------------------ 1 files changed, 9 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3c3f369..1e1b3b0 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -66,7 +66,7 @@ static inline ContextMenu *impl_from_IContextMenu2(IContextMenu2 *iface) return CONTAINING_RECORD(iface, ContextMenu, IContextMenu2_iface); } -static HRESULT WINAPI ItemMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { ContextMenu *This = impl_from_IContextMenu2(iface); @@ -95,7 +95,7 @@ static HRESULT WINAPI ItemMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI ItemMenu_AddRef(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_AddRef(IContextMenu2 *iface) { ContextMenu *This = impl_from_IContextMenu2(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -103,7 +103,7 @@ static ULONG WINAPI ItemMenu_AddRef(IContextMenu2 *iface) return ref; } -static ULONG WINAPI ItemMenu_Release(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_Release(IContextMenu2 *iface) { ContextMenu *This = impl_from_IContextMenu2(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -553,9 +553,9 @@ static HRESULT WINAPI ItemMenu_HandleMenuMsg( static const IContextMenu2Vtbl ItemContextMenuVtbl = { - ItemMenu_QueryInterface, - ItemMenu_AddRef, - ItemMenu_Release, + ContextMenu_QueryInterface, + ContextMenu_AddRef, + ContextMenu_Release, ItemMenu_QueryContextMenu, ItemMenu_InvokeCommand, ItemMenu_GetCommandString, @@ -590,62 +590,6 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co } /* Background menu implementation */ -static HRESULT WINAPI BackgroundMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, void **ppvObj) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IContextMenu) || - IsEqualIID(riid, &IID_IContextMenu2)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/ - { - FIXME("-- LPSHELLEXTINIT pointer requested\n"); - } - - if(*ppvObj) - { - IContextMenu2_AddRef(iface); - TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); - return S_OK; - } - - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -static ULONG WINAPI BackgroundMenu_AddRef(IContextMenu2 *iface) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; -} - -static ULONG WINAPI BackgroundMenu_Release(IContextMenu2 *iface) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%u)\n", This, ref); - - if (!ref) - { - if (This->parent) - IShellFolder_Release(This->parent); - - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - static HRESULT WINAPI BackgroundMenu_QueryContextMenu( IContextMenu2 *iface, HMENU hMenu, @@ -927,9 +871,9 @@ static HRESULT WINAPI BackgroundMenu_HandleMenuMsg( static const IContextMenu2Vtbl BackgroundContextMenuVtbl = { - BackgroundMenu_QueryInterface, - BackgroundMenu_AddRef, - BackgroundMenu_Release, + ContextMenu_QueryInterface, + ContextMenu_AddRef, + ContextMenu_Release, BackgroundMenu_QueryContextMenu, BackgroundMenu_InvokeCommand, BackgroundMenu_GetCommandString,

1 0