wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alistair Leslie-Hughes : mscoree: Implement ICorDebug SetManagedHandler.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 5682743245d3c079b40899f7f840bd5a3813de05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5682743245d3c079b40899f7f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 16:08:06 2011 +1000 mscoree: Implement ICorDebug SetManagedHandler. --- dlls/mscoree/cordebug.c | 100 +++++++++-- dlls/mscoree/corruntimehost.c | 7 +- dlls/mscoree/mscoree_private.h | 15 ++- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/debugging.c | 377 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 473 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5682743245d3c079b4089…

1 0

Dmitry Timoshkov : user32: Fix the logic deciding when to write to the destination structure.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 197f867feff0bddaca0c2d2470fbaa04acd6e3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f867feff0bddaca0c2d247… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 10 12:05:14 2011 +0900 user32: Fix the logic deciding when to write to the destination structure. --- dlls/user32/sysparams.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 15838ed..afa15a2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -463,10 +463,13 @@ static void SYSPARAMS_NonClientMetrics32WTo32A( const NONCLIENTMETRICSW* lpnm32W SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfMenuFont, &lpnm32A->lfMenuFont ); SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfStatusFont, &lpnm32A->lfStatusFont ); SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfMessageFont, &lpnm32A->lfMessageFont ); - if (lpnm32A->cbSize == sizeof(NONCLIENTMETRICSA) && lpnm32W->cbSize == sizeof(NONCLIENTMETRICSW)) - lpnm32A->iPaddedBorderWidth = lpnm32W->iPaddedBorderWidth; - else - lpnm32A->iPaddedBorderWidth = 0; + if (lpnm32A->cbSize > FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth)) + { + if (lpnm32W->cbSize > FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)) + lpnm32A->iPaddedBorderWidth = lpnm32W->iPaddedBorderWidth; + else + lpnm32A->iPaddedBorderWidth = 0; + } } static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A, LPNONCLIENTMETRICSW lpnm32W ) @@ -485,10 +488,13 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMenuFont, &lpnm32W->lfMenuFont ); SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfStatusFont, &lpnm32W->lfStatusFont ); SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMessageFont, &lpnm32W->lfMessageFont ); - if (lpnm32A->cbSize == sizeof(NONCLIENTMETRICSA) && lpnm32W->cbSize == sizeof(NONCLIENTMETRICSW)) - lpnm32W->iPaddedBorderWidth = lpnm32A->iPaddedBorderWidth; - else - lpnm32W->iPaddedBorderWidth = 0; + if (lpnm32W->cbSize > FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)) + { + if (lpnm32A->cbSize > FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth)) + lpnm32W->iPaddedBorderWidth = lpnm32A->iPaddedBorderWidth; + else + lpnm32W->iPaddedBorderWidth = 0; + } }

1 0

Michael Stefaniuc : shell32: Avoid an unsafe iface to object cast in AddToEnumList().
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 28d8819b63220dd7786c68a04bc626e4607428d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d8819b63220dd7786c68a04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:04:37 2011 +0200 shell32: Avoid an unsafe iface to object cast in AddToEnumList(). --- dlls/shell32/cpanelfolder.c | 27 ++++++++++++++------------- dlls/shell32/enumidlist.c | 13 +++---------- dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shell32_main.h | 4 ++-- dlls/shell32/shfldr_desktop.c | 4 ++-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 4 ++-- 7 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 15ad067..b006632 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -286,7 +286,7 @@ static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl) /************************************************************************** * ISF_ControlPanel_fnEnumObjects */ -static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) +static BOOL SHELL_RegisterCPanelApp(IEnumIDListImpl *list, LPCSTR path) { LPITEMIDLIST pidl; CPlApplet* applet; @@ -329,7 +329,7 @@ static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) return TRUE; } -static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterRegistryCPanelApps(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; char value[MAX_PATH]; @@ -358,7 +358,7 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, L return cnt; } -static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; HKEY hkey; @@ -391,19 +391,18 @@ static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR /************************************************************************** * CreateCPanelEnumList() */ -static BOOL CreateCPanelEnumList( - IEnumIDList * iface, - DWORD dwFlags) +static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) { CHAR szPath[MAX_PATH]; WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS) @@ -414,7 +413,7 @@ static BOOL CreateCPanelEnumList( p = PathAddBackslashA(szPath); strcpy(p, "*.cpl"); - TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",iface,debugstr_a(szPath)); + TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n", list, debugstr_a(szPath)); hFile = FindFirstFileA(szPath, &wfd); if (hFile != INVALID_HANDLE_VALUE) @@ -426,14 +425,16 @@ static BOOL CreateCPanelEnumList( if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(p, wfd.cFileName); - SHELL_RegisterCPanelApp(iface, szPath); + SHELL_RegisterCPanelApp(list, szPath); } } while(FindNextFileA(hFile, &wfd)); FindClose(hFile); } - SHELL_RegisterRegistryCPanelApps(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - SHELL_RegisterRegistryCPanelApps(iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(list, HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(list, HKEY_CURRENT_USER, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); } return TRUE; } @@ -451,8 +452,8 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumObjects(IShellFolder2 *iface, HWND if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateCPanelEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateCPanelEnumList(*ppEnumIDList, dwFlags); TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 9e43ed4..8ee789b 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -39,17 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************** * AddToEnumList() */ -BOOL AddToEnumList( - IEnumIDList * iface, - LPITEMIDLIST pidl) +BOOL AddToEnumList(IEnumIDListImpl *This, LPITEMIDLIST pidl) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - struct enumlist *pNew; TRACE("(%p)->(pidl=%p)\n",This,pidl); - if (!iface || !pidl) + if (!This || !pidl) return FALSE; pNew = SHAlloc(sizeof(*pNew)); @@ -83,10 +79,7 @@ BOOL AddToEnumList( /************************************************************************** * CreateFolderEnumList() */ -BOOL CreateFolderEnumList( - IEnumIDList *list, - LPCWSTR lpszPath, - DWORD dwFlags) +BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) { LPITEMIDLIST pidl=NULL; WIN32_FIND_DATAW stffile; diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 715be87..6b7d4aa 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -426,7 +426,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) - if (!AddToEnumList(&list->IEnumIDList_iface, pidls[i])) + if (!AddToEnumList(list, pidls[i])) goto failed; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 18ddf71..dd5f1ab 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -223,11 +223,11 @@ typedef struct /* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ IEnumIDListImpl *IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; -BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; +BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and * adds them to the already-created list. */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 2ea5244..5b90260 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -286,7 +286,7 @@ static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', 'o','r','e','r','\\','D','e','s','k','t','o','p','\\','N','a','m','e','s','p', 'a','c','e','\0' }; -static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) +static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; @@ -352,8 +352,8 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateDesktopEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateDesktopEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 3556a62..b591533 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -455,8 +455,8 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateFolderEnumList(list, This->sPathTarget, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 9afb4d8..d32f975 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -292,7 +292,7 @@ static const WCHAR MyComputer_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', 'o','r','e','r','\\','M','y','C','o','m','p','u','t','e','r','\\','N','a','m', 'e','s','p','a','c','e','\0' }; -static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) +static BOOL CreateMyCompEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; @@ -362,8 +362,8 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateMyCompEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateMyCompEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);

1 0

Michael Stefaniuc : shell32: Return the IEnumIDList object on its creation.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: bd407b700e46ade4ef2e860a7a93bebb70cc89eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd407b700e46ade4ef2e860a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:02:48 2011 +0200 shell32: Return the IEnumIDList object on its creation. --- dlls/shell32/cpanelfolder.c | 10 ++++++---- dlls/shell32/enumidlist.c | 22 ++-------------------- dlls/shell32/recyclebin.c | 8 ++++---- dlls/shell32/shell32_main.h | 18 +++++++++++++++++- dlls/shell32/shfldr_desktop.c | 10 ++++++---- dlls/shell32/shfldr_fs.c | 10 ++++++---- dlls/shell32/shfldr_mycomp.c | 10 ++++++---- dlls/shell32/shfldr_netplaces.c | 7 +++++-- 8 files changed, 52 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index d6c8f5c..15ad067 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -445,16 +445,18 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumObjects(IShellFolder2 *iface, HWND DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { ICPanelImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateCPanelEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateCPanelEnumList(*ppEnumIDList, dwFlags); TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return(*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index fbfe881..9e43ed4 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -36,22 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -struct enumlist -{ - struct enumlist *pNext; - LPITEMIDLIST pidl; -}; - -typedef struct -{ - IEnumIDList IEnumIDList_iface; - LONG ref; - struct enumlist *mpFirst; - struct enumlist *mpLast; - struct enumlist *mpCurrent; - -} IEnumIDListImpl; - /************************************************************************** * AddToEnumList() */ @@ -340,7 +324,7 @@ static const IEnumIDListVtbl eidlvt = IEnumIDList_fnClone, }; -IEnumIDList *IEnumIDList_Constructor(void) +IEnumIDListImpl *IEnumIDList_Constructor(void) { IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lpeidl)); @@ -349,10 +333,8 @@ IEnumIDList *IEnumIDList_Constructor(void) lpeidl->ref = 1; lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; } - else - return NULL; TRACE("-- (%p)->()\n",lpeidl); - return &lpeidl->IEnumIDList_iface; + return lpeidl; } diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 9e75c30..715be87 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -408,7 +408,7 @@ static HRESULT WINAPI RecycleBin_ParseDisplayName(IShellFolder2 *This, HWND hwnd static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList) { RecycleBin *This = impl_from_IShellFolder2(iface); - IEnumIDList *list; + IEnumIDListImpl *list; LPITEMIDLIST *pidls; HRESULT ret = E_OUTOFMEMORY; int pidls_count; @@ -426,16 +426,16 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) - if (!AddToEnumList(list, pidls[i])) + if (!AddToEnumList(&list->IEnumIDList_iface, pidls[i])) goto failed; } - *ppenumIDList = list; + *ppenumIDList = &list->IEnumIDList_iface; return S_OK; failed: if (list) - IEnumIDList_Release(list); + IEnumIDList_Release(&list->IEnumIDList_iface); for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 9359a3a..18ddf71 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -205,8 +205,24 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN; BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; +/* IEnumIDList stuff */ +struct enumlist +{ + struct enumlist *pNext; + LPITEMIDLIST pidl; +}; + +typedef struct +{ + IEnumIDList IEnumIDList_iface; + LONG ref; + struct enumlist *mpFirst; + struct enumlist *mpLast; + struct enumlist *mpCurrent; +} IEnumIDListImpl; + /* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ -LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; +IEnumIDListImpl *IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 808b920..2ea5244 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -345,17 +345,19 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateDesktopEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateDesktopEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return *ppEnumIDList ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index dd0231a..3556a62 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -448,17 +448,19 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return *ppEnumIDList ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 265c5a4..9afb4d8 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -355,17 +355,19 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateMyCompEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateMyCompEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 4c95d3e..c5034f8 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -244,15 +244,18 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /**************************************************************************

1 0

Michael Stefaniuc : shell32: Simplify RecycleBin_EnumObjects() a little.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 27b284d4c9501047c77d79beb0c2740397c5f5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b284d4c9501047c77d79beb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:00:46 2011 +0200 shell32: Simplify RecycleBin_EnumObjects() a little. --- dlls/shell32/recyclebin.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 44e99fc..9e75c30 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -410,33 +410,27 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH RecycleBin *This = impl_from_IShellFolder2(iface); IEnumIDList *list; LPITEMIDLIST *pidls; - HRESULT ret; + HRESULT ret = E_OUTOFMEMORY; int pidls_count; int i=0; TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); + *ppenumIDList = NULL; + list = IEnumIDList_Constructor(); + if (!list) + return E_OUTOFMEMORY; + if (grfFlags & SHCONTF_NONFOLDERS) { - *ppenumIDList = NULL; if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) - return ret; - - list = IEnumIDList_Constructor(); - if (list == NULL) goto failed; for (i=0; i<pidls_count; i++) if (!AddToEnumList(list, pidls[i])) goto failed; - *ppenumIDList = list; } - else - { - *ppenumIDList = IEnumIDList_Constructor(); - if (*ppenumIDList == NULL) - return E_OUTOFMEMORY; - } - + + *ppenumIDList = list; return S_OK; failed: @@ -445,7 +439,7 @@ failed: for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls); - return E_OUTOFMEMORY; + return ret; } static HRESULT WINAPI RecycleBin_BindToObject(IShellFolder2 *This, LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv)

1 0

Michael Stefaniuc : shell32: Get rid of a local typedef for a struct.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: d81f55fae6f3fd146fc9517c276b7f67c1e20d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81f55fae6f3fd146fc9517c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:58:43 2011 +0200 shell32: Get rid of a local typedef for a struct. --- dlls/shell32/enumidlist.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index f04ddd5..fbfe881 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -36,20 +36,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -typedef struct tagENUMLIST +struct enumlist { - struct tagENUMLIST *pNext; + struct enumlist *pNext; LPITEMIDLIST pidl; - -} ENUMLIST, *LPENUMLIST; +}; typedef struct { IEnumIDList IEnumIDList_iface; LONG ref; - LPENUMLIST mpFirst; - LPENUMLIST mpLast; - LPENUMLIST mpCurrent; + struct enumlist *mpFirst; + struct enumlist *mpLast; + struct enumlist *mpCurrent; } IEnumIDListImpl; @@ -62,14 +61,14 @@ BOOL AddToEnumList( { IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - LPENUMLIST pNew; + struct enumlist *pNew; TRACE("(%p)->(pidl=%p)\n",This,pidl); if (!iface || !pidl) return FALSE; - pNew = SHAlloc(sizeof(ENUMLIST)); + pNew = SHAlloc(sizeof(*pNew)); if(pNew) { /*set the next pointer */ @@ -164,7 +163,7 @@ BOOL CreateFolderEnumList( static BOOL DeleteList(IEnumIDListImpl *This) { - LPENUMLIST pDelete; + struct enumlist *pDelete; TRACE("(%p)->()\n",This);

1 0

Michael Stefaniuc : shell32: Avoid the forward declaration of the IEnumIDList vtbl.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 8d1fc3b48667f0f45f9fbaebb855fae71e4f4457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1fc3b48667f0f45f9fbaebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:55:51 2011 +0200 shell32: Avoid the forward declaration of the IEnumIDList vtbl. --- dlls/shell32/enumidlist.c | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 02868db..f04ddd5 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -53,8 +53,6 @@ typedef struct } IEnumIDListImpl; -static const IEnumIDListVtbl eidlvt; - /************************************************************************** * AddToEnumList() */ @@ -186,29 +184,6 @@ static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface) } /************************************************************************** - * IEnumIDList_Folder_Constructor - * - */ - -IEnumIDList * IEnumIDList_Constructor(void) -{ - IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl)); - - if (lpeidl) - { - lpeidl->ref = 1; - lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; - } - else - return NULL; - - TRACE("-- (%p)->()\n",lpeidl); - - return &lpeidl->IEnumIDList_iface; -} - -/************************************************************************** * IEnumIDList::QueryInterface */ static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj) @@ -365,3 +340,20 @@ static const IEnumIDListVtbl eidlvt = IEnumIDList_fnReset, IEnumIDList_fnClone, }; + +IEnumIDList *IEnumIDList_Constructor(void) +{ + IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lpeidl)); + + if (lpeidl) + { + lpeidl->ref = 1; + lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; + } + else + return NULL; + + TRACE("-- (%p)->()\n",lpeidl); + + return &lpeidl->IEnumIDList_iface; +}

1 0

Michael Stefaniuc : shell32: Basic COM cleanup for the IEnumIDList iface.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: b8638ef9ef0615bf2c8c75b00c131875aa3d9542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8638ef9ef0615bf2c8c75b00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:53:53 2011 +0200 shell32: Basic COM cleanup for the IEnumIDList iface. --- dlls/shell32/enumidlist.c | 72 ++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 2eb0ff8..02868db 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -45,7 +45,7 @@ typedef struct tagENUMLIST typedef struct { - const IEnumIDListVtbl *lpVtbl; + IEnumIDList IEnumIDList_iface; LONG ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; @@ -180,6 +180,11 @@ static BOOL DeleteList(IEnumIDListImpl *This) return TRUE; } +static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface) +{ + return CONTAINING_RECORD(iface, IEnumIDListImpl, IEnumIDList_iface); +} + /************************************************************************** * IEnumIDList_Folder_Constructor * @@ -193,22 +198,22 @@ IEnumIDList * IEnumIDList_Constructor(void) if (lpeidl) { lpeidl->ref = 1; - lpeidl->lpVtbl = &eidlvt; + lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; } + else + return NULL; + TRACE("-- (%p)->()\n",lpeidl); - return (IEnumIDList*)lpeidl; + return &lpeidl->IEnumIDList_iface; } /************************************************************************** - * EnumIDList_QueryInterface + * IEnumIDList::QueryInterface */ -static HRESULT WINAPI IEnumIDList_fnQueryInterface( - IEnumIDList * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -232,12 +237,11 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface( } /****************************************************************************** - * IEnumIDList_fnAddRef + * IEnumIDList::AddRef */ -static ULONG WINAPI IEnumIDList_fnAddRef( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnAddRef(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount - 1); @@ -245,12 +249,11 @@ static ULONG WINAPI IEnumIDList_fnAddRef( return refCount; } /****************************************************************************** - * IEnumIDList_fnRelease + * IEnumIDList::Release */ -static ULONG WINAPI IEnumIDList_fnRelease( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnRelease(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -264,16 +267,13 @@ static ULONG WINAPI IEnumIDList_fnRelease( } /************************************************************************** - * IEnumIDList_fnNext + * IEnumIDList::Next */ -static HRESULT WINAPI IEnumIDList_fnNext( - IEnumIDList * iface, - ULONG celt, - LPITEMIDLIST * rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI IEnumIDList_fnNext(IEnumIDList *iface, ULONG celt, LPITEMIDLIST *rgelt, + ULONG *pceltFetched) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG i; HRESULT hr = S_OK; @@ -313,12 +313,11 @@ static HRESULT WINAPI IEnumIDList_fnNext( } /************************************************************************** -* IEnumIDList_fnSkip +* IEnumIDList::Skip */ -static HRESULT WINAPI IEnumIDList_fnSkip( - IEnumIDList * iface,ULONG celt) +static HRESULT WINAPI IEnumIDList_fnSkip(IEnumIDList *iface, ULONG celt) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); DWORD dwIndex; HRESULT hr = S_OK; @@ -335,32 +334,27 @@ static HRESULT WINAPI IEnumIDList_fnSkip( return hr; } /************************************************************************** -* IEnumIDList_fnReset +* IEnumIDList::Reset */ -static HRESULT WINAPI IEnumIDList_fnReset( - IEnumIDList * iface) +static HRESULT WINAPI IEnumIDList_fnReset(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)\n",This); This->mpCurrent = This->mpFirst; return S_OK; } /************************************************************************** -* IEnumIDList_fnClone +* IEnumIDList::Clone */ -static HRESULT WINAPI IEnumIDList_fnClone( - IEnumIDList * iface,LPENUMIDLIST * ppenum) +static HRESULT WINAPI IEnumIDList_fnClone(IEnumIDList *iface, IEnumIDList **ppenum) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum); return E_NOTIMPL; } -/************************************************************************** - * IEnumIDList_fnVTable - */ static const IEnumIDListVtbl eidlvt = { IEnumIDList_fnQueryInterface,

1 0

Michael Stefaniuc : shell32: Pass an object instead of an iface to a helper function.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: a6e4c721a2b58371864865f68030b936bc83a5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e4c721a2b58371864865f68… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:52:43 2011 +0200 shell32: Pass an object instead of an iface to a helper function. --- dlls/shell32/enumidlist.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 643e039..2eb0ff8 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -164,14 +164,8 @@ BOOL CreateFolderEnumList( return succeeded; } -/************************************************************************** -* DeleteList() -*/ -static BOOL DeleteList( - IEnumIDList * iface) +static BOOL DeleteList(IEnumIDListImpl *This) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - LPENUMLIST pDelete; TRACE("(%p)->()\n",This); @@ -263,7 +257,7 @@ static ULONG WINAPI IEnumIDList_fnRelease( if (!refCount) { TRACE(" destroying IEnumIDList(%p)\n",This); - DeleteList((IEnumIDList*)This); + DeleteList(This); HeapFree(GetProcessHeap(),0,This); } return refCount;

1 0

Michael Stefaniuc : shell32: Merge enumidlist.h into the main header file.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 61c8da18ef237084bd91f9e6b0f1cda449758df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8da18ef237084bd91f9e6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:49:06 2011 +0200 shell32: Merge enumidlist.h into the main header file. --- dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/enumidlist.c | 2 +- dlls/shell32/enumidlist.h | 30 ------------------------------ dlls/shell32/recyclebin.c | 1 - dlls/shell32/shell32_main.h | 10 ++++++++++ dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 1 - 9 files changed, 11 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 611be0f..d6c8f5c 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -42,7 +42,6 @@ #include "commctrl.h" #include "cpanel.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index c3d363c..643e039 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -32,7 +32,7 @@ #include "shlwapi.h" #include "pidl.h" -#include "enumidlist.h" +#include "shell32_main.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/enumidlist.h b/dlls/shell32/enumidlist.h deleted file mode 100644 index 3fb27d0..0000000 --- a/dlls/shell32/enumidlist.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef __ENUMIDLIST_H__ -#define __ENUMIDLIST_H__ - -#include "shlobj.h" - -/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ -LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; -BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; - -/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and - * adds them to the already-created list. - */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; - -#endif /* ndef __ENUMIDLIST_H__ */ diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 4a8cec4..44e99fc 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -41,7 +41,6 @@ #include "wine/debug.h" #include "shell32_main.h" -#include "enumidlist.h" #include "xdg.h" #include "pidl.h" diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 96b3098..9359a3a 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -204,4 +204,14 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN; /* Detect Shell Links */ BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; + +/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ +LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; +BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; + +/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and + * adds them to the already-created list. + */ +BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; + #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 9bf08ef..808b920 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -42,7 +42,6 @@ #include "ole2.h" #include "shlguid.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 969f18d..dd0231a 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -42,7 +42,6 @@ #include "ole2.h" #include "shlguid.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b9cbea4..265c5a4 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -39,7 +39,6 @@ #include "wingdi.h" #include "pidl.h" #include "shlguid.h" -#include "enumidlist.h" #include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 0ab0470..4c95d3e 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -38,7 +38,6 @@ #include "winreg.h" #include "pidl.h" -#include "enumidlist.h" #include "undocshell.h" #include "shell32_main.h" #include "shresdef.h"

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011