January 2012 - Wine-Commits

Daniel Lehman : dbghelp: Use CDECL calling convention for __unDName and callbacks.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 44233d5f07fefaa0c3951137de20d51e8fe1a7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44233d5f07fefaa0c3951137d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 15:53:09 2012 -0800 dbghelp: Use CDECL calling convention for __unDName and callbacks. --- dlls/dbghelp/symbol.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d9227ea..6c5aebf 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1843,8 +1843,8 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName UNDNAME_COMPLETE) != 0; } -static void* und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static void und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } +static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } +static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } /*********************************************************************** * UnDecorateSymbolName (DBGHELP.@) @@ -1853,7 +1853,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) { /* undocumented from msvcrt */ - static char* (*p_undname)(char*, const char*, int, void* (*)(size_t), void (*)(void*), unsigned short); + static char* (* CDECL p_undname)(char*, const char*, int, void* (* CDECL)(size_t), void (* CDECL)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; TRACE("(%s, %p, %d, 0x%08x)\n",

1 0

Huw Davies : gdi32: Don't create the outline region twice.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 7994f2c03b6a555a57b29cbfc7db0be34ab5f068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7994f2c03b6a555a57b29cbfc… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 9 14:20:22 2012 +0000 gdi32: Don't create the outline region twice. --- dlls/gdi32/dibdrv/graphics.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 766514f..166c577 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -271,11 +271,10 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, !(interior = CreatePolygonRgn( points, count, WINDING ))) { HeapFree( GetProcessHeap(), 0, points ); + if (outline) DeleteObject( outline ); return FALSE; } - if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); - /* if not using a region, paint the interior first so the outline can overlap it */ if (interior && !outline) { @@ -1036,11 +1035,10 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, ellipse_width, ellipse_height ))) { HeapFree( GetProcessHeap(), 0, points ); + if (outline) DeleteObject( outline ); return FALSE; } - if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); - /* if not using a region, paint the interior first so the outline can overlap it */ if (interior && !outline) {

1 0

Alistair Leslie-Hughes : mscoree: Don't pass the string as a reference type .
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 091f31744ac9d4415cc7f9cced1ac1f78ddbe000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091f31744ac9d4415cc7f9cce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 08:40:12 2012 +1100 mscoree: Don't pass the string as a reference type. --- dlls/mscoree/corruntimehost.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 04482be..5042f20 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -592,9 +592,12 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* goto cleanup; } + /* The .NET function we are calling has the following declaration + * public static int functionName(String param) + */ argsA = WtoA(pwzArgument); str = This->mono->mono_string_new(domain, argsA); - args[0] = &str; + args[0] = str; args[1] = NULL; result = This->mono->mono_runtime_invoke(method, NULL, args, NULL); if (!result)

1 0

Nikolay Sivov : shell32: Use S_OK as successful return code name.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: a4dd8fb6a8a1424d356aa3194030e1c5dd751db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dd8fb6a8a1424d356aa3194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:31:54 2012 +0300 shell32: Use S_OK as successful return code name. --- dlls/shell32/folders.c | 2 +- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/shelllink.c | 12 ++++++------ dlls/shell32/shellole.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shlfsbind.c | 4 ++-- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 4 ++-- dlls/shell32/shv_bg_cmenu.c | 4 ++-- dlls/shell32/shv_item_cmenu.c | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 379ffde..6f49a3d 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -381,7 +381,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); - return NOERROR; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c394e5b..2130b49 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1140,7 +1140,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: @@ -1199,7 +1199,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, pfd->cAlternateFileName[0] = '\0'; else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14)) pfd->cAlternateFileName[13] = 0; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2561f8c..5370b99 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -932,7 +932,7 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) { IUnknown * pUnk = ptr; IUnknown_Release(pUnk); - return NOERROR; + return S_OK; } return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 1fb3fbd..e325e2e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -509,11 +509,11 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile return r; } -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName) +static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR filename) { - IShellLinkImpl *This = impl_from_IPersistFile(iface); - FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName)); - return NOERROR; + IShellLinkImpl *This = impl_from_IPersistFile(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename)); + return S_OK; } static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) @@ -1597,7 +1597,7 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA *iface, INT iShowCmd) This->iShowCmd = iShowCmd; This->bDirty = TRUE; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR pszIconPath, @@ -1866,7 +1866,7 @@ static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR psz if( This->sArgs ) lstrcpynW( pszArgs, This->sArgs, cchMaxPath ); - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 49491a0..fbf917d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -507,7 +507,7 @@ HRESULT WINAPI SHCreateDefClassObject( if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY; *ppv = pcf; - return NOERROR; + return S_OK; } /************************************************************************* diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5b74c37..05105c5 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1162,7 +1162,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown) return E_FAIL; IUnknown_AddRef(SHELL32_IExplorerInterface); - return NOERROR; + return S_OK; } /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f3490c1..71d82c8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2961,7 +2961,7 @@ HRESULT WINAPI SHGetFolderLocation( } } if(*ppidl) - hr = NOERROR; + hr = S_OK; TRACE("-- (new pidl %p)\n",*ppidl); return hr; diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index ff13013..5988290 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -166,7 +166,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( return E_INVALIDARG; *pfd = This->findFile; - return NOERROR; + return S_OK; } static HRESULT WINAPI IFileSystemBindData_fnSetFindData( @@ -179,5 +179,5 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( This->findFile = *pfd; else memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); - return NOERROR; + return S_OK; } diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 4006807..476cbec 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -184,7 +184,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) LPITEMIDLIST pidlTemp = NULL; ULONG ulFetched; - while ((!bAbortInit) && (NOERROR == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) + while ((!bAbortInit) && (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) { if (SUCCEEDED (IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr))) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 787a1b7..191dfb1 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1998,7 +1998,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 *iface, LPFOLDERSE if (!lpfs) return E_INVALIDARG; *lpfs = This->FolderSettings; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 *iface, DWORD dwReserved, @@ -2559,7 +2559,7 @@ static HRESULT WINAPI ISVDropSource_QueryContinueDrag( else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON)) return DRAGDROP_S_DROP; else - return NOERROR; + return S_OK; } static HRESULT WINAPI ISVDropSource_GiveFeedback( diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b8f16b3..c2c6f08 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -372,7 +372,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( if (lpSV) IShellView_Release(lpSV); /* QueryActiveShellView does AddRef */ - return NOERROR; + return S_OK; } /************************************************************************** @@ -401,7 +401,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) { - return NOERROR; + return S_OK; } } } diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index f1a96cf..4c05460 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -535,7 +535,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( return E_FAIL; } } - return NOERROR; + return S_OK; } /************************************************************************** @@ -567,7 +567,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); - hr = NOERROR; + hr = S_OK; break; } break; @@ -579,14 +579,14 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = NOERROR; + hr = S_OK; break; } break; case GCS_VALIDATEA: case GCS_VALIDATEW: - hr = NOERROR; + hr = S_OK; break; } TRACE("-- (%p)->(name=%s)\n",This, lpszName);

1 0

Nikolay Sivov : shell32: Store common menu data in a separate structure.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: beb89fd16097a516529cf8b8e98a9863f1e0b58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb89fd16097a516529cf8b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 02:49:19 2012 +0300 shell32: Store common menu data in a separate structure. --- dlls/shell32/shv_bg_cmenu.c | 7 ++- dlls/shell32/shv_item_cmenu.c | 99 +++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b67dc4d..b8f16b3 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -430,7 +430,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg( * IContextMenu2 VTable * */ -static const IContextMenu2Vtbl cmvt = +static const IContextMenu2Vtbl BackgroundContextMenuVtbl = { ISVBgCm_fnQueryInterface, ISVBgCm_fnAddRef, @@ -445,11 +445,12 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder *pSFParent, BOOL bDesktop) { BgCmImpl *cm; - cm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cm)); - cm->IContextMenu2_iface.lpVtbl = &cmvt; + cm = HeapAlloc(GetProcessHeap(), 0, sizeof(*cm)); + cm->IContextMenu2_iface.lpVtbl = &BackgroundContextMenuVtbl; cm->ref = 1; cm->pSFParent = pSFParent; cm->bDesktop = bDesktop; + cm->verb_offset = 0; if(pSFParent) IShellFolder_AddRef(pSFParent); TRACE("(%p)->()\n", cm); diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 604099c..8a97a6e 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -42,29 +42,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct +{ + IContextMenu2 IContextMenu2_iface; + LONG ref; + IShellFolder* parent; + UINT verb_offset; +} ContextMenu; + /************************************************************************** * IContextMenu Implementation */ typedef struct { - IContextMenu2 IContextMenu2_iface; - LONG ref; - IShellFolder* pSFParent; + ContextMenu menu; + LPITEMIDLIST pidl; /* root pidl */ LPITEMIDLIST *apidl; /* array of child pidls */ UINT cidl; BOOL bAllValues; - UINT verb_offset; } ItemCmImpl; static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) { - return CONTAINING_RECORD(iface, ItemCmImpl, IContextMenu2_iface); + return CONTAINING_RECORD(iface, ItemCmImpl, menu.IContextMenu2_iface); } - -static const IContextMenu2Vtbl cmvt; - /************************************************************************** * ISvItemCm_CanRenameItems() */ @@ -79,42 +83,13 @@ static BOOL ISvItemCm_CanRenameItems(ItemCmImpl *This) for(i = 0; i < This->cidl; i++){} if(i > 1) return FALSE; /* can't rename more than one item at a time*/ dwAttributes = SFGAO_CANRENAME; - IShellFolder_GetAttributesOf(This->pSFParent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); + IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); return dwAttributes & SFGAO_CANRENAME; } return FALSE; } /************************************************************************** -* ISvItemCm_Constructor() -*/ -IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) -{ ItemCmImpl* cm; - UINT u; - - cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ItemCmImpl)); - cm->IContextMenu2_iface.lpVtbl = &cmvt; - cm->ref = 1; - cm->pidl = ILClone(pidl); - cm->pSFParent = pSFParent; - - if(pSFParent) IShellFolder_AddRef(pSFParent); - - cm->apidl = _ILCopyaPidl(apidl, cidl); - cm->cidl = cidl; - - cm->bAllValues = 1; - for(u = 0; u < cidl; u++) - { - cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); - } - - TRACE("(%p)->()\n",cm); - - return &cm->IContextMenu2_iface; -} - -/************************************************************************** * ISvItemCm_fnQueryInterface */ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) @@ -152,7 +127,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) { ItemCmImpl *This = impl_from_IContextMenu2(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->menu.ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -165,7 +140,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { ItemCmImpl *This = impl_from_IContextMenu2(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG refCount = InterlockedDecrement(&This->menu.ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -173,8 +148,8 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { TRACE(" destroying IContextMenu(%p)\n",This); - if(This->pSFParent) - IShellFolder_Release(This->pSFParent); + if(This->menu.parent) + IShellFolder_Release(This->menu.parent); SHFree(This->pidl); @@ -229,7 +204,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - This->verb_offset=idCmdFirst; + This->menu.verb_offset=idCmdFirst; if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) { @@ -339,7 +314,7 @@ static void DoDelete(ItemCmImpl *This) { ISFHelper * psfhlp; - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); + IShellFolder_QueryInterface(This->menu.parent, &IID_ISFHelper, (LPVOID*)&psfhlp); if (psfhlp) { ISFHelper_DeleteItems(psfhlp, This->cidl, (LPCITEMIDLIST *)This->apidl); @@ -516,7 +491,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( if (HIWORD(lpcmi->lpVerb) == 0) { - switch(LOWORD(lpcmi->lpVerb-This->verb_offset)) + switch(LOWORD(lpcmi->lpVerb-This->menu.verb_offset)) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -547,7 +522,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( DoOpenProperties(This, lpcmi->hwnd); break; default: - FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->verb_offset); + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->menu.verb_offset); return E_INVALIDARG; } } @@ -591,7 +566,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( break; case GCS_VERBA: - switch(idCommand-This->verb_offset) + switch(idCommand-This->menu.verb_offset) { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); @@ -603,7 +578,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This case, you need to do the lstrcpyW to the pointer passed.*/ case GCS_VERBW: - switch(idCommand-This->verb_offset) + switch(idCommand-This->menu.verb_offset) { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); @@ -640,7 +615,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( return E_NOTIMPL; } -static const IContextMenu2Vtbl cmvt = +static const IContextMenu2Vtbl ItemContextMenuVtbl = { ISvItemCm_fnQueryInterface, ISvItemCm_fnAddRef, @@ -650,3 +625,29 @@ static const IContextMenu2Vtbl cmvt = ISvItemCm_fnGetCommandString, ISvItemCm_fnHandleMenuMsg }; + +IContextMenu2 *ISvItemCm_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) +{ ItemCmImpl* cm; + UINT u; + + cm = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemCmImpl)); + cm->menu.IContextMenu2_iface.lpVtbl = &ItemContextMenuVtbl; + cm->menu.ref = 1; + cm->menu.verb_offset = 0; + cm->menu.parent = parent; + + cm->pidl = ILClone(pidl); + + if (parent) IShellFolder_AddRef(parent); + + cm->apidl = _ILCopyaPidl(apidl, cidl); + cm->cidl = cidl; + + cm->bAllValues = 1; + for(u = 0; u < cidl; u++) + cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); + + TRACE("(%p)\n",cm); + + return &cm->menu.IContextMenu2_iface; +}

1 0

Daniel Lehman : msvcp90: Add basic_ios<wchar_t> stubs.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 4e7b3bad6be0aa5fa9df07e0974afd159085db34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7b3bad6be0aa5fa9df07e09… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jan 5 12:22:54 2012 -0800 msvcp90: Add basic_ios<wchar_t> stubs. --- dlls/msvcp90/ios.c | 190 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 74 +++++++++--------- 2 files changed, 227 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e7b3bad6be0aa5fa9df0…

1 0

Daniel Lehman : msvcrt: Add _snwprintf_l.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 08aa6ae52df861bfe790c27e838da0018f02d699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08aa6ae52df861bfe790c27e8… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 13:09:37 2012 -0800 msvcrt: Add _snwprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 38ec0e1..99d6c3d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1099,7 +1099,7 @@ @ varargs _snscanf_s(str long str) msvcrt._snscanf_s @ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf -@ stub _snwprintf_l +@ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a083053..ca284bf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -953,7 +953,7 @@ @ varargs _snscanf_s(str long str) msvcrt._snscanf_s @ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf -@ stub _snwprintf_l +@ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 475e3a9..2ede2cc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -946,7 +946,7 @@ @ varargs _snscanf_s(str long str) msvcrt._snscanf_s @ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf -@ stub _snwprintf_l +@ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 75a3b35..1260dfa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -890,7 +890,7 @@ @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s @ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf -# stub _snwprintf_l(ptr long wstr ptr) +@ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s # stub _snwprintf_s_l(ptr long long wstr ptr) @ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 17ff532..b6786ce 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -778,6 +778,20 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT } /********************************************************************* + * _snwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnwprintf_l(str, len, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _snwprintf_s (MSVCRT.@) */ int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,

1 0

Nikolay Sivov : msxml3: Some put_dataType() tests for nodes without typed data.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: ebf91350cdac3e9f3fdb8b1ae26473221f0fe5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf91350cdac3e9f3fdb8b1ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 9 00:21:53 2012 +0300 msxml3: Some put_dataType() tests for nodes without typed data. --- dlls/msxml3/cdata.c | 4 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/tests/domdoc.c | 77 ++++++++++++++++++++++++++++---------------- 6 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 0058314..c6d1f8c 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _domcdata +typedef struct { xmlnode node; IXMLDOMCDATASection IXMLDOMCDATASection_iface; @@ -436,7 +436,7 @@ static HRESULT WINAPI domcdata_put_dataType( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 5663632..f1f94c6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -435,7 +435,7 @@ static HRESULT WINAPI domcomment_put_dataType( { domcomment *This = impl_from_IXMLDOMComment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 435712c..cedd258 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -433,7 +433,7 @@ static HRESULT WINAPI domfrag_put_dataType( { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index b6b0ae4..313fc2e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -428,7 +428,7 @@ static HRESULT WINAPI entityref_put_dataType( { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 23027a1..332d97c 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -506,7 +506,7 @@ static HRESULT WINAPI dom_pi_put_dataType( { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d737d7f..5ed8715 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6777,10 +6777,26 @@ static put_datatype_t put_datatype_data[] = { { NULL } }; -static void test_nodeTypeTests( void ) +typedef struct { + DOMNodeType type; + HRESULT hr; +} put_datatype_notype_t; + +static put_datatype_notype_t put_dt_notype[] = { + { NODE_PROCESSING_INSTRUCTION, E_FAIL }, + { NODE_DOCUMENT_FRAGMENT, E_FAIL }, + { NODE_ENTITY_REFERENCE, E_FAIL }, + { NODE_CDATA_SECTION, E_FAIL }, + { NODE_COMMENT, E_FAIL }, + { NODE_INVALID } +}; + +static void test_put_dataType( void ) { + const put_datatype_notype_t *ptr2 = put_dt_notype; const put_datatype_t *ptr = put_datatype_data; IXMLDOMElement *root, *element; + BSTR nameW, type1W, type2W; IXMLDOMDocument *doc; HRESULT hr; @@ -6831,6 +6847,38 @@ static void test_nodeTypeTests( void ) IXMLDOMElement_Release(element); + /* try to set type for node without a type */ + nameW = _bstr_("testname"); + type1W = _bstr_("string"); + type2W = _bstr_("number"); + while (ptr2->type != NODE_INVALID) + { + IXMLDOMNode *node; + VARIANT type; + + V_VT(&type) = VT_I2; + V_I2(&type) = ptr2->type; + + hr = IXMLDOMDocument_createNode(doc, type, nameW, NULL, &node); + EXPECT_HR(hr, S_OK); + if(hr == S_OK) + { + hr = IXMLDOMElement_appendChild(root, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_put_dataType(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMNode_put_dataType(node, type1W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + hr = IXMLDOMNode_put_dataType(node, type2W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + + IXMLDOMNode_Release(node); + } + ptr2++; + } + IXMLDOMElement_Release(root); IXMLDOMDocument_Release(doc); free_bstrs(); @@ -8490,32 +8538,6 @@ static void test_setAttributeNode(void) free_bstrs(); } -static void test_put_dataType(void) -{ - IXMLDOMCDATASection *cdata; - IXMLDOMDocument *doc; - VARIANT_BOOL b; - HRESULT hr; - - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b ); - ok( hr == S_OK, "loadXML failed\n"); - ok( b == VARIANT_TRUE, "failed to load XML string\n"); - - hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("test"), &cdata); - ok( hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("number")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("string")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - IXMLDOMCDATASection_Release(cdata); - - IXMLDOMDocument_Release(doc); - free_bstrs(); -} - static void test_createNode(void) { IXMLDOMDocument *doc; @@ -11062,7 +11084,6 @@ START_TEST(domdoc) test_XSLPattern(); test_cloneNode(); test_xmlTypes(); - test_nodeTypeTests(); test_save(); test_testTransforms(); test_namespaces();

1 0

Daniel Lehman : msvcrt: Add struct and prototypes for existing _findfirst64 and _findnext64.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: e0f1bac434b896297277cac34fb53206714c7d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f1bac434b896297277cac34… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 12:24:50 2012 -0800 msvcrt: Add struct and prototypes for existing _findfirst64 and _findnext64. --- include/msvcrt/io.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index c7ba9ab..ad5c507 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -47,6 +47,16 @@ struct _finddatai64_t __int64 DECLSPEC_ALIGN(8) size; char name[260]; }; + +struct _finddata64_t +{ + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; #endif /* _FINDDATA_T_DEFINED */ #ifndef _WFINDDATA_T_DEFINED @@ -88,8 +98,10 @@ __msvcrt_long __cdecl _filelength(int); int __cdecl _findclose(intptr_t); intptr_t __cdecl _findfirst(const char*,struct _finddata_t*); intptr_t __cdecl _findfirsti64(const char*, struct _finddatai64_t*); +intptr_t __cdecl _findfirst64(const char*, struct _finddata64_t*); int __cdecl _findnext(intptr_t,struct _finddata_t*); int __cdecl _findnexti64(intptr_t, struct _finddatai64_t*); +int __cdecl _findnext64(intptr_t, struct _finddata64_t*); intptr_t __cdecl _get_osfhandle(int); int __cdecl _isatty(int); int __cdecl _locking(int,int,__msvcrt_long);

1 0

Stefan Leichter : opengl32: Added export glDebugEntry to spec file.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 97b9fc9e396c417b933c3710540fe428f7ae57e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b9fc9e396c417b933c37105… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Jan 8 14:49:44 2012 +0100 opengl32: Added export glDebugEntry to spec file. --- dlls/opengl32/opengl32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index a83a142..b0853a9 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -56,6 +56,7 @@ @ stdcall glCopyTexSubImage1D( long long long long long long ) wine_glCopyTexSubImage1D @ stdcall glCopyTexSubImage2D( long long long long long long long long ) wine_glCopyTexSubImage2D @ stdcall glCullFace( long ) wine_glCullFace +@ stub glDebugEntry @ stdcall glDeleteLists( long long ) wine_glDeleteLists @ stdcall glDeleteTextures( long ptr ) wine_glDeleteTextures @ stdcall glDepthFunc( long ) wine_glDepthFunc

1 0