January 2012 - Wine-commits

Daniel Lehman : libwine: Use larger buffer in vsnprintfW for large numbers.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 8bed3b6f2cb96d884c6f181d1a2e3c79ab77dbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bed3b6f2cb96d884c6f181d1… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 12:25:40 2012 -0800 libwine: Use larger buffer in vsnprintfW for large numbers. --- libs/wine/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 8f85c63..0b42ea8 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -351,7 +351,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { unsigned int written = 0; const WCHAR *iter = format; - char bufa[256], fmtbufa[64], *fmta; + char bufa[512], fmtbufa[64], *fmta; while (*iter) {

1 0

Daniel Lehman : msvcrt: Add _snwprintf_l.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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

Daniel Lehman : dbghelp: Use CDECL calling convention for __unDName and callbacks.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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

Stefan Leichter : opengl32: Added export glDebugEntry to spec file.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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

Huw Davies : gdi32: Don't create the outline region twice.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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 09 Jan '12

09 Jan '12

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

Daniel Lehman : msvcp90: Add basic_ios<wchar_t> stubs.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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 : kernel32: If string arg to FormatMessage is NULL, use "( null)" instead of crashing.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: b1f04e23bf361e06d239e03693c904a597b9a32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f04e23bf361e06d239e0369… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 10:48:44 2012 -0800 kernel32: If string arg to FormatMessage is NULL, use "(null)" instead of crashing. --- dlls/kernel32/format_msg.c | 9 ++++++--- dlls/kernel32/tests/format_msg.c | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index d6d19ff..b9e471f 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,15 +135,18 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, if (*format != '!') /* simple string */ { arg = get_arg( insert, flags, args ); - if (unicode_caller) + if (unicode_caller || !arg) { - WCHAR *str = (WCHAR *)arg; + static const WCHAR nullW[] = {'(','n','u','l','l',')',0}; + const WCHAR *str = (const WCHAR *)arg; + + if (!str) str = nullW; *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); strcpyW( *result, str ); } else { - char *str = (char *)arg; + const char *str = (const char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 37ea3e9..1f56440 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -125,6 +125,7 @@ static void test_message_from_string_wide(void) static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0}; static const WCHAR s_sp002sp003[] = {' ',' ','0','0','0','2',',',' ','0','0','0','0','3',0}; static const WCHAR s_sp001004[] = {' ',' ','0','0','1',',','0','0','0','0','0','4',0}; + static const WCHAR s_null[] = {'(','n','u','l','l',')',0}; static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'}; static const WCHAR broken_buf[] = {'t','e','s','t','x','x'}; @@ -381,6 +382,12 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* null string as argument */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ok(!lstrcmpW(s_null, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, @@ -700,6 +707,12 @@ static void test_message_from_string(void) ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* null string as argument */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!strcmp("(null)", out),"failed out=[%s]\n",out); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!",

1 0

Nikolay Sivov : shell32: Store common menu data in a separate structure.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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

Nikolay Sivov : shell32: Remove redundant loop to count already known value .
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 1e864366284065ffcb0fae7a10512c6059f95a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e864366284065ffcb0fae7a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:14:36 2012 +0300 shell32: Remove redundant loop to count already known value. --- dlls/shell32/shv_item_cmenu.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 8a97a6e..f1a96cf 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -73,20 +73,17 @@ static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) * ISvItemCm_CanRenameItems() */ static BOOL ISvItemCm_CanRenameItems(ItemCmImpl *This) -{ UINT i; - DWORD dwAttributes; +{ + DWORD attr; - TRACE("(%p)->()\n",This); + TRACE("(%p)\n", This); - if(This->apidl) - { - 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->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); - return dwAttributes & SFGAO_CANRENAME; - } - return FALSE; + /* can't rename more than one item at a time*/ + if (!This->apidl || This->cidl > 1) return FALSE; + + attr = SFGAO_CANRENAME; + IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + return attr & SFGAO_CANRENAME; } /**************************************************************************

1 0