3 Sep
2011
3 Sep
'11
3:37 p.m.
Author: akhaldi
Date: Sat Sep 3 15:37:09 2011
New Revision: 53546
URL: http://svn.reactos.org/svn/reactos?rev=53546&view=rev
Log:
[FORMATTING]
* No code changes.
Modified:
branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp
branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp
branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Sep
3 15:37:09 2011
@@ -132,10 +132,10 @@
* This way the caller can make a single GlobalFree call to free both, as per MSDN.
*/
argv = (LPWSTR *)LocalAlloc(LMEM_FIXED,
argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR));
-
+
if (!argv)
return NULL;
-
+
cmdline=(LPWSTR)(argv+argc);
wcscpy(cmdline, lpCmdline);
@@ -241,17 +241,17 @@
SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
ReadFile( hfile, magic, sizeof(magic), &len, NULL );
-
+
if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE )
{
SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
ReadFile( hfile, &nt, sizeof(nt), &len, NULL );
CloseHandle( hfile );
-
+
/* DLL files are not executable and should return 0 */
if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL)
return 0;
-
+
if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI)
{
return IMAGE_NT_SIGNATURE |
@@ -266,7 +266,7 @@
SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
ReadFile( hfile, &ne, sizeof(ne), &len, NULL );
CloseHandle( hfile );
-
+
if (ne.ne_exetyp == 2)
return IMAGE_OS2_SIGNATURE | (ne.ne_expver << 16);
return 0;
@@ -586,7 +586,7 @@
GetSystemMetrics( SM_CXICON),
GetSystemMetrics( SM_CYICON),
&psfi->hIcon, 0, 1, 0);
-
+
if (ret != 0 && ret != 0xFFFFFFFF)
{
IconNotYetLoaded=FALSE;
@@ -1130,7 +1130,7 @@
PAINTSTRUCT ps;
HDC hdc;
HDC hdcMem;
-
+
hdc = BeginPaint(hWnd, &ps);
hdcMem = CreateCompatibleDC(hdc);
Modified: branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sat Sep 3
15:37:09 2011
@@ -47,45 +47,45 @@
struct LINK_HEADER
{
- DWORD dwSize; /* 0x00 size of the header - 0x4c */
- GUID MagicGuid; /* 0x04 is CLSID_ShellLink */
- DWORD dwFlags; /* 0x14 describes elements following */
- DWORD dwFileAttr; /* 0x18 attributes of the target file */
- FILETIME Time1; /* 0x1c */
- FILETIME Time2; /* 0x24 */
- FILETIME Time3; /* 0x2c */
- DWORD dwFileLength; /* 0x34 File length */
- DWORD nIcon; /* 0x38 icon number */
- DWORD fStartup; /* 0x3c startup type */
- DWORD wHotKey; /* 0x40 hotkey */
- DWORD Unknown5; /* 0x44 */
- DWORD Unknown6; /* 0x48 */
+ DWORD dwSize; /* 0x00 size of the header - 0x4c */
+ GUID MagicGuid; /* 0x04 is CLSID_ShellLink */
+ DWORD dwFlags; /* 0x14 describes elements following */
+ DWORD dwFileAttr; /* 0x18 attributes of the target file */
+ FILETIME Time1; /* 0x1c */
+ FILETIME Time2; /* 0x24 */
+ FILETIME Time3; /* 0x2c */
+ DWORD dwFileLength; /* 0x34 File length */
+ DWORD nIcon; /* 0x38 icon number */
+ DWORD fStartup; /* 0x3c startup type */
+ DWORD wHotKey; /* 0x40 hotkey */
+ DWORD Unknown5; /* 0x44 */
+ DWORD Unknown6; /* 0x48 */
};
struct LOCATION_INFO
{
- DWORD dwTotalSize;
- DWORD dwHeaderSize;
- DWORD dwFlags;
- DWORD dwVolTableOfs;
- DWORD dwLocalPathOfs;
- DWORD dwNetworkVolTableOfs;
- DWORD dwFinalPathOfs;
+ DWORD dwTotalSize;
+ DWORD dwHeaderSize;
+ DWORD dwFlags;
+ DWORD dwVolTableOfs;
+ DWORD dwLocalPathOfs;
+ DWORD dwNetworkVolTableOfs;
+ DWORD dwFinalPathOfs;
};
struct LOCAL_VOLUME_INFO
{
- DWORD dwSize;
- DWORD dwType;
- DWORD dwVolSerial;
- DWORD dwVolLabelOfs;
+ DWORD dwSize;
+ DWORD dwType;
+ DWORD dwVolSerial;
+ DWORD dwVolLabelOfs;
};
struct volume_info
{
- DWORD type;
- DWORD serial;
- WCHAR label[12]; /* assume 8.3 */
+ DWORD type;
+ DWORD serial;
+ WCHAR label[12]; /* assume 8.3 */
};
#include "poppack.h"
@@ -98,7 +98,7 @@
static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str)
{
INT len;
- LPWSTR p;
+ LPWSTR p;
assert(str);
@@ -122,26 +122,26 @@
ShellLink::ShellLink()
{
- pPidl = NULL;
- wHotKey = 0;
- memset(&time1, 0, sizeof(time1));
- memset(&time2, 0, sizeof(time2));
- memset(&time3, 0, sizeof(time3));
- iShowCmd = SW_SHOWNORMAL;
- sIcoPath = NULL;
- iIcoNdx = 0;
- sPath = NULL;
- sArgs = NULL;
- sWorkDir = NULL;
- sDescription = NULL;
- sPathRel = NULL;
- sProduct = NULL;
- sComponent = NULL;
- memset(&volume, 0, sizeof(volume));
+ pPidl = NULL;
+ wHotKey = 0;
+ memset(&time1, 0, sizeof(time1));
+ memset(&time2, 0, sizeof(time2));
+ memset(&time3, 0, sizeof(time3));
+ iShowCmd = SW_SHOWNORMAL;
+ sIcoPath = NULL;
+ iIcoNdx = 0;
+ sPath = NULL;
+ sArgs = NULL;
+ sWorkDir = NULL;
+ sDescription = NULL;
+ sPathRel = NULL;
+ sProduct = NULL;
+ sComponent = NULL;
+ memset(&volume, 0, sizeof(volume));
sLinkPath = NULL;
- bRunAs = FALSE;
- bDirty = FALSE;
- iIdOpen = -1;
+ bRunAs = FALSE;
+ bDirty = FALSE;
+ iIdOpen = -1;
}
ShellLink::~ShellLink()
@@ -163,42 +163,42 @@
{
TRACE("%p %p\n", this, pclsid);
- if (pclsid == NULL)
- return E_POINTER;
+ if (pclsid == NULL)
+ return E_POINTER;
*pclsid = CLSID_ShellLink;
return S_OK;
}
HRESULT WINAPI ShellLink::IsDirty()
{
- TRACE("(%p)\n",this);
-
- if (bDirty)
- return S_OK;
-
- return S_FALSE;
+ TRACE("(%p)\n",this);
+
+ if (bDirty)
+ return S_OK;
+
+ return S_FALSE;
}
HRESULT WINAPI ShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode)
{
- HRESULT r;
- CComPtr<IStream> stm;
-
- TRACE("(%p, %s, %x)\n",this, debugstr_w(pszFileName), dwMode);
-
- if (dwMode == 0)
- dwMode = STGM_READ | STGM_SHARE_DENY_WRITE;
- r = SHCreateStreamOnFileW(pszFileName, dwMode, &stm);
- if (SUCCEEDED(r))
- {
- HeapFree(GetProcessHeap(), 0, sLinkPath);
- sLinkPath = strdupW(pszFileName);
- r = Load(stm);
- ShellLink_UpdatePath(sPathRel, pszFileName, sWorkDir, &sPath);
- bDirty = FALSE;
- }
- TRACE("-- returning hr %08x\n", r);
- return r;
+ HRESULT r;
+ CComPtr<IStream> stm;
+
+ TRACE("(%p, %s, %x)\n",this, debugstr_w(pszFileName), dwMode);
+
+ if (dwMode == 0)
+ dwMode = STGM_READ | STGM_SHARE_DENY_WRITE;
+ r = SHCreateStreamOnFileW(pszFileName, dwMode, &stm);
+ if (SUCCEEDED(r))
+ {
+ HeapFree(GetProcessHeap(), 0, sLinkPath);
+ sLinkPath = strdupW(pszFileName);
+ r = Load(stm);
+ ShellLink_UpdatePath(sPathRel, pszFileName, sWorkDir, &sPath);
+ bDirty = FALSE;
+ }
+ TRACE("-- returning hr %08x\n", r);
+ return r;
}
static BOOL StartLinkProcessor( LPCOLESTR szLink )
@@ -239,21 +239,21 @@
HRESULT WINAPI ShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember)
{
- HRESULT r;
- CComPtr<IStream> stm;
-
- TRACE("(%p)->(%s)\n", this, debugstr_w(pszFileName));
-
- if (!pszFileName)
- return E_FAIL;
-
- r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE |
STGM_SHARE_EXCLUSIVE, &stm );
- if( SUCCEEDED( r ) )
- {
- r = Save(stm, FALSE);
-
- if( SUCCEEDED( r ) )
- {
+ HRESULT r;
+ CComPtr<IStream> stm;
+
+ TRACE("(%p)->(%s)\n", this, debugstr_w(pszFileName));
+
+ if (!pszFileName)
+ return E_FAIL;
+
+ r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE |
STGM_SHARE_EXCLUSIVE, &stm );
+ if( SUCCEEDED( r ) )
+ {
+ r = Save(stm, FALSE);
+
+ if( SUCCEEDED( r ) )
+ {
if ( sLinkPath )
{
HeapFree(GetProcessHeap(), 0, sLinkPath);
@@ -264,24 +264,24 @@
wcscpy(sLinkPath, pszFileName);
}
- StartLinkProcessor( pszFileName );
-
- bDirty = FALSE;
- }
- else
- {
- DeleteFileW( pszFileName );
- WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName) );
- }
- }
-
- return r;
+ StartLinkProcessor( pszFileName );
+
+ bDirty = FALSE;
+ }
+ else
+ {
+ DeleteFileW( pszFileName );
+ WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName) );
+ }
+ }
+
+ return r;
}
HRESULT WINAPI ShellLink::SaveCompleted(LPCOLESTR pszFileName)
{
- FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName));
- return NOERROR;
+ FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName));
+ return NOERROR;
}
HRESULT WINAPI ShellLink::GetCurFile(LPOLESTR *ppszFileName)
@@ -442,7 +442,7 @@
}
static HRESULT Stream_LoadLocation( IStream *stm,
- ShellLink::volume_info *volume, LPWSTR *path )
+ ShellLink::volume_info *volume, LPWSTR *path )
{
char *p = NULL;
LOCATION_INFO *loc;
@@ -922,9 +922,9 @@
*/
HRESULT WINAPI ShellLink::GetSizeMax(ULARGE_INTEGER *pcbSize)
{
- TRACE("(%p)\n", this);
-
- return E_NOTIMPL;
+ TRACE("(%p)\n", this);
+
+ return E_NOTIMPL;
}
static BOOL SHELL_ExistsFileW(LPCWSTR path)
@@ -936,50 +936,50 @@
/**************************************************************************
* ShellLink_UpdatePath
- * update absolute path in sPath using relative path in sPathRel
+ * update absolute path in sPath using relative path in sPathRel
*/
static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir,
LPWSTR* psPath)
{
if (!path || !psPath)
- return E_INVALIDARG;
+ return E_INVALIDARG;
if (!*psPath && sPathRel) {
- WCHAR buffer[2*MAX_PATH], abs_path[2*MAX_PATH];
- LPWSTR final = NULL;
-
- /* first try if [directory of link file] + [relative path] finds an existing file */
+ WCHAR buffer[2*MAX_PATH], abs_path[2*MAX_PATH];
+ LPWSTR final = NULL;
+
+ /* first try if [directory of link file] + [relative path] finds an existing file
*/
GetFullPathNameW( path, MAX_PATH*2, buffer, &final );
if( !final )
final = buffer;
- wcscpy(final, sPathRel);
-
- *abs_path = '\0';
-
- if (SHELL_ExistsFileW(buffer)) {
- if (!GetFullPathNameW(buffer, MAX_PATH, abs_path, &final))
- wcscpy(abs_path, buffer);
- } else {
- /* try if [working directory] + [relative path] finds an existing file */
- if (sWorkDir) {
- wcscpy(buffer, sWorkDir);
- wcscpy(PathAddBackslashW(buffer), sPathRel);
-
- if (SHELL_ExistsFileW(buffer))
- if (!GetFullPathNameW(buffer, MAX_PATH, abs_path, &final))
- wcscpy(abs_path, buffer);
- }
- }
-
- /* FIXME: This is even not enough - not all shell links can be resolved using this
algorithm. */
- if (!*abs_path)
- wcscpy(abs_path, sPathRel);
-
- *psPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(abs_path)+1)*sizeof(WCHAR));
- if (!*psPath)
- return E_OUTOFMEMORY;
-
- wcscpy(*psPath, abs_path);
+ wcscpy(final, sPathRel);
+
+ *abs_path = '\0';
+
+ if (SHELL_ExistsFileW(buffer)) {
+ if (!GetFullPathNameW(buffer, MAX_PATH, abs_path, &final))
+ wcscpy(abs_path, buffer);
+ } else {
+ /* try if [working directory] + [relative path] finds an existing file */
+ if (sWorkDir) {
+ wcscpy(buffer, sWorkDir);
+ wcscpy(PathAddBackslashW(buffer), sPathRel);
+
+ if (SHELL_ExistsFileW(buffer))
+ if (!GetFullPathNameW(buffer, MAX_PATH, abs_path, &final))
+ wcscpy(abs_path, buffer);
+ }
+ }
+
+ /* FIXME: This is even not enough - not all shell links can be resolved using
this algorithm. */
+ if (!*abs_path)
+ wcscpy(abs_path, sPathRel);
+
+ *psPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(abs_path)+1)*sizeof(WCHAR));
+ if (!*psPath)
+ return E_OUTOFMEMORY;
+
+ wcscpy(*psPath, abs_path);
}
return S_OK;
@@ -1010,7 +1010,7 @@
if (!pPidl)
{
- *ppidl = NULL;
+ *ppidl = NULL;
return S_FALSE;
}
*ppidl = ILClone(pPidl);
@@ -1040,7 +1040,7 @@
pszName[0] = 0;
if( sDescription )
WideCharToMultiByte( CP_ACP, 0, sDescription, -1,
- pszName, cchMaxName, NULL, NULL);
+ pszName, cchMaxName, NULL, NULL);
return S_OK;
}
@@ -1167,15 +1167,15 @@
HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf,
&pidlLast);
if (SUCCEEDED(hr)) {
- CComPtr<IExtractIconA> pei;
-
- hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL,
(LPVOID*)&pei);
-
- if (SUCCEEDED(hr)) {
- hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL);
- }
-
- psf->Release();
+ CComPtr<IExtractIconA> pei;
+
+ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL,
(LPVOID*)&pei);
+
+ if (SUCCEEDED(hr)) {
+ hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL);
+ }
+
+ psf->Release();
}
return hr;
@@ -1191,40 +1191,40 @@
if (sIcoPath)
{
WideCharToMultiByte(CP_ACP, 0, sIcoPath, -1, pszIconPath, cchIconPath, NULL,
NULL);
- return S_OK;
+ return S_OK;
}
if (pPidl || sPath)
{
- CComPtr<IShellFolder> pdsk;
-
- HRESULT hr = SHGetDesktopFolder(&pdsk);
-
- if (SUCCEEDED(hr))
+ CComPtr<IShellFolder> pdsk;
+
+ HRESULT hr = SHGetDesktopFolder(&pdsk);
+
+ if (SUCCEEDED(hr))
{
- /* first look for an icon using the PIDL (if present) */
- if (pPidl)
- hr = SHELL_PidlGeticonLocationA(pdsk, pPidl, pszIconPath, cchIconPath,
piIcon);
- else
- hr = E_FAIL;
-
- /* if we couldn't find an icon yet, look for it using the file system path
*/
- if (FAILED(hr) && sPath)
+ /* first look for an icon using the PIDL (if present) */
+ if (pPidl)
+ hr = SHELL_PidlGeticonLocationA(pdsk, pPidl, pszIconPath, cchIconPath,
piIcon);
+ else
+ hr = E_FAIL;
+
+ /* if we couldn't find an icon yet, look for it using the file system
path */
+ if (FAILED(hr) && sPath)
{
- LPITEMIDLIST pidl;
-
- hr = pdsk->ParseDisplayName(0, NULL, sPath, NULL, &pidl, NULL);
-
- if (SUCCEEDED(hr))
+ LPITEMIDLIST pidl;
+
+ hr = pdsk->ParseDisplayName(0, NULL, sPath, NULL, &pidl, NULL);
+
+ if (SUCCEEDED(hr))
{
- hr = SHELL_PidlGeticonLocationA(pdsk, pidl, pszIconPath, cchIconPath,
piIcon);
-
- SHFree(pidl);
- }
- }
- }
-
- return hr;
+ hr = SHELL_PidlGeticonLocationA(pdsk, pidl, pszIconPath, cchIconPath,
piIcon);
+
+ SHFree(pidl);
+ }
+ }
+ }
+
+ return hr;
}
return S_OK;
}
@@ -1276,36 +1276,36 @@
if (!sPath && pPidl)
{
- WCHAR buffer[MAX_PATH];
-
- bSuccess = SHGetPathFromIDListW(pPidl, buffer);
-
- if (bSuccess && *buffer)
+ WCHAR buffer[MAX_PATH];
+
+ bSuccess = SHGetPathFromIDListW(pPidl, buffer);
+
+ if (bSuccess && *buffer)
{
- sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(buffer)+1)*sizeof(WCHAR));
-
+ sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(buffer)+1)*sizeof(WCHAR));
+
if (!sPath)
- return E_OUTOFMEMORY;
-
- wcscpy(sPath, buffer);
-
- bDirty = TRUE;
- }
+ return E_OUTOFMEMORY;
+
+ wcscpy(sPath, buffer);
+
+ bDirty = TRUE;
+ }
else
- hr = S_OK; /* don't report an error occurred while just caching
information */
+ hr = S_OK; /* don't report an error occurred while just caching
information */
}
if (!sIcoPath && sPath)
{
- sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(sPath)+1)*sizeof(WCHAR));
-
+ sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(wcslen(sPath)+1)*sizeof(WCHAR));
+
if (!sIcoPath)
- return E_OUTOFMEMORY;
-
- wcscpy(sIcoPath, sPath);
- iIcoNdx = 0;
-
- bDirty = TRUE;
+ return E_OUTOFMEMORY;
+
+ wcscpy(sIcoPath, sPath);
+ iIcoNdx = 0;
+
+ bDirty = TRUE;
}
return hr;
@@ -1317,8 +1317,8 @@
LPWSTR str;
TRACE("(%p)->(path=%s)\n",this, pszFile);
- if (pszFile == NULL)
- return E_INVALIDARG;
+ if (pszFile == NULL)
+ return E_INVALIDARG;
str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile);
if (!str)
@@ -1340,7 +1340,7 @@
if (cchMaxPath)
pszFile[0] = 0;
-
+
if (sPath)
lstrcpynW( pszFile, sPath, cchMaxPath );
@@ -1439,15 +1439,15 @@
HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf,
&pidlLast);
if (SUCCEEDED(hr)) {
- CComPtr<IExtractIconW> pei;
-
- hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL,
(LPVOID*)&pei);
-
- if (SUCCEEDED(hr)) {
- hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags);
- }
-
- psf->Release();
+ CComPtr<IExtractIconW> pei;
+
+ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL,
(LPVOID*)&pei);
+
+ if (SUCCEEDED(hr)) {
+ hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags);
+ }
+
+ psf->Release();
}
return hr;
@@ -1462,40 +1462,40 @@
if (sIcoPath)
{
- lstrcpynW(pszIconPath, sIcoPath, cchIconPath);
- return S_OK;
+ lstrcpynW(pszIconPath, sIcoPath, cchIconPath);
+ return S_OK;
}
if (pPidl || sPath)
{
- CComPtr<IShellFolder> pdsk;
-
- HRESULT hr = SHGetDesktopFolder(&pdsk);
-
- if (SUCCEEDED(hr))
+ CComPtr<IShellFolder> pdsk;
+
+ HRESULT hr = SHGetDesktopFolder(&pdsk);
+
+ if (SUCCEEDED(hr))
{
- /* first look for an icon using the PIDL (if present) */
- if (pPidl)
- hr = SHELL_PidlGeticonLocationW(pdsk, pPidl, pszIconPath, cchIconPath, piIcon);
- else
- hr = E_FAIL;
-
- /* if we couldn't find an icon yet, look for it using the file system path */
- if (FAILED(hr) && sPath)
+ /* first look for an icon using the PIDL (if present) */
+ if (pPidl)
+ hr = SHELL_PidlGeticonLocationW(pdsk, pPidl, pszIconPath, cchIconPath,
piIcon);
+ else
+ hr = E_FAIL;
+
+ /* if we couldn't find an icon yet, look for it using the file system
path */
+ if (FAILED(hr) && sPath)
{
- LPITEMIDLIST pidl;
-
- hr = pdsk->ParseDisplayName(0, NULL, sPath, NULL, &pidl, NULL);
-
- if (SUCCEEDED(hr))
+ LPITEMIDLIST pidl;
+
+ hr = pdsk->ParseDisplayName(0, NULL, sPath, NULL, &pidl, NULL);
+
+ if (SUCCEEDED(hr))
{
- hr = SHELL_PidlGeticonLocationW(pdsk, pidl, pszIconPath, cchIconPath, piIcon);
-
- SHFree(pidl);
- }
- }
- }
- return hr;
+ hr = SHELL_PidlGeticonLocationW(pdsk, pidl, pszIconPath, cchIconPath,
piIcon);
+
+ SHFree(pidl);
+ }
+ }
+ }
+ return hr;
}
return S_OK;
}
@@ -1523,7 +1523,7 @@
HeapFree(GetProcessHeap(), 0, sPathRel);
sPathRel = (LPWSTR)HeapAlloc( GetProcessHeap(), 0,
- (wcslen( pszPathRel )+1) * sizeof (WCHAR) );
+ (wcslen( pszPathRel )+1) * sizeof (WCHAR) );
if ( !sPathRel )
return E_OUTOFMEMORY;
wcscpy( sPathRel, pszPathRel );
@@ -1670,10 +1670,10 @@
if (*pszFile == '\0')
*buffer = '\0';
else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname))
- return E_FAIL;
+ return E_FAIL;
else if(!PathFileExistsW(buffer) &&
- !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL))
- hr = S_FALSE;
+ !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL))
+ hr = S_FALSE;
pPidl = SHSimpleIDListFromPathW(pszFile);
ShellLink_GetVolumeInfo(buffer, &volume);
@@ -1706,21 +1706,21 @@
switch (dwSig)
{
- case EXP_DARWIN_ID_SIG:
- if (!sComponent)
+ case EXP_DARWIN_ID_SIG:
+ if (!sComponent)
+ break;
+ block = shelllink_build_darwinid( sComponent, dwSig );
+ r = S_OK;
break;
- block = shelllink_build_darwinid( sComponent, dwSig );
- r = S_OK;
- break;
- case EXP_SZ_LINK_SIG:
- case NT_CONSOLE_PROPS_SIG:
- case NT_FE_CONSOLE_PROPS_SIG:
- case EXP_SPECIAL_FOLDER_SIG:
- case EXP_SZ_ICON_SIG:
- FIXME("valid but unhandled datablock %08x\n", dwSig);
- break;
- default:
- ERR("unknown datablock %08x\n", dwSig);
+ case EXP_SZ_LINK_SIG:
+ case NT_CONSOLE_PROPS_SIG:
+ case NT_FE_CONSOLE_PROPS_SIG:
+ case EXP_SPECIAL_FOLDER_SIG:
+ case EXP_SZ_ICON_SIG:
+ FIXME("valid but unhandled datablock %08x\n", dwSig);
+ break;
+ default:
+ ERR("unknown datablock %08x\n", dwSig);
}
*ppDataBlock = block;
return r;
@@ -1955,47 +1955,42 @@
return E_NOTIMPL;
}
-INT_PTR CALLBACK ExtendedShortcutProc(
- HWND hwndDlg,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam
-)
-{
- HWND hDlgCtrl;
-
- switch(uMsg)
- {
- case WM_INITDIALOG:
- if (lParam)
- {
+INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg,
+ WPARAM wParam, LPARAM lParam)
+{
+ HWND hDlgCtrl;
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ if (lParam)
+ {
+ hDlgCtrl = GetDlgItem(hwndDlg, 14000);
+ SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0);
+ }
+ return TRUE;
+ case WM_COMMAND:
hDlgCtrl = GetDlgItem(hwndDlg, 14000);
- SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0);
- }
- return TRUE;
- case WM_COMMAND:
- hDlgCtrl = GetDlgItem(hwndDlg, 14000);
- if (LOWORD(wParam) == IDOK)
- {
- if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED )
- EndDialog(hwndDlg, 1);
- else
- EndDialog(hwndDlg, 0);
- }
- else if (LOWORD(wParam) == IDCANCEL)
- {
- EndDialog(hwndDlg, -1);
- }
- else if (LOWORD(wParam) == 14000)
- {
- if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED)
- SendMessage(hDlgCtrl, BM_SETCHECK, BST_UNCHECKED, 0);
- else
- SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0);
-
- }
- }
- return FALSE;
+ if (LOWORD(wParam) == IDOK)
+ {
+ if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED )
+ EndDialog(hwndDlg, 1);
+ else
+ EndDialog(hwndDlg, 0);
+ }
+ else if (LOWORD(wParam) == IDCANCEL)
+ {
+ EndDialog(hwndDlg, -1);
+ }
+ else if (LOWORD(wParam) == 14000)
+ {
+ if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED)
+ SendMessage(hDlgCtrl, BM_SETCHECK, BST_UNCHECKED, 0);
+ else
+ SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0);
+ }
+ }
+ return FALSE;
}
/**************************************************************************
@@ -2019,113 +2014,113 @@
switch(uMsg)
{
- case WM_INITDIALOG:
- ppsp = (LPPROPSHEETPAGEW)lParam;
- if (ppsp == NULL)
- break;
-
- TRACE("ShellLink_DlgProc (WM_INITDIALOG hwnd %p lParam %p ppsplParam
%x)\n",hwndDlg, lParam, ppsp->lParam);
-
- pThis = (ShellLink *)ppsp->lParam;
- SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pThis);
-
- TRACE("sArgs: %S sComponent: %S sDescription: %S sIcoPath: %S sPath: %S sPathRel:
%S sProduct: %S sWorkDir: %S\n", pThis->sArgs, pThis->sComponent,
pThis->sDescription,
- pThis->sIcoPath, pThis->sPath, pThis->sPathRel, pThis->sProduct,
pThis->sWorkDir);
-
- /* target path */
- hDlgCtrl = GetDlgItem( hwndDlg, 14009 );
- if ( hDlgCtrl != NULL )
- SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)pThis->sPath );
-
- /* working dir */
- hDlgCtrl = GetDlgItem( hwndDlg, 14011 );
- if ( hDlgCtrl != NULL )
- SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)pThis->sWorkDir
);
-
- /* description */
- hDlgCtrl = GetDlgItem( hwndDlg, 14019 );
- if ( hDlgCtrl != NULL )
- SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)pThis->sDescription );
- return TRUE;
- case WM_NOTIFY:
- lppsn = (LPPSHNOTIFY) lParam;
- if ( lppsn->hdr.code == PSN_APPLY )
- {
- /* set working directory */
+ case WM_INITDIALOG:
+ ppsp = (LPPROPSHEETPAGEW)lParam;
+ if (ppsp == NULL)
+ break;
+
+ TRACE("ShellLink_DlgProc (WM_INITDIALOG hwnd %p lParam %p ppsplParam
%x)\n",hwndDlg, lParam, ppsp->lParam);
+
+ pThis = (ShellLink *)ppsp->lParam;
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pThis);
+
+ TRACE("sArgs: %S sComponent: %S sDescription: %S sIcoPath: %S sPath: %S
sPathRel: %S sProduct: %S sWorkDir: %S\n", pThis->sArgs, pThis->sComponent,
pThis->sDescription,
+ pThis->sIcoPath, pThis->sPath, pThis->sPathRel, pThis->sProduct,
pThis->sWorkDir);
+
+ /* target path */
+ hDlgCtrl = GetDlgItem( hwndDlg, 14009 );
+ if ( hDlgCtrl != NULL )
+ SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)pThis->sPath
);
+
+ /* working dir */
hDlgCtrl = GetDlgItem( hwndDlg, 14011 );
- SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer );
- pThis->SetWorkingDirectory(szBuffer);
- /* set link destination */
- hDlgCtrl = GetDlgItem( hwndDlg, 14009 );
- SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer);
- if ( !SHELL_ExistsFileW(szBuffer) )
+ if ( hDlgCtrl != NULL )
+ SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)pThis->sWorkDir );
+
+ /* description */
+ hDlgCtrl = GetDlgItem( hwndDlg, 14019 );
+ if ( hDlgCtrl != NULL )
+ SendMessageW( hDlgCtrl, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)pThis->sDescription );
+ return TRUE;
+ case WM_NOTIFY:
+ lppsn = (LPPSHNOTIFY) lParam;
+ if ( lppsn->hdr.code == PSN_APPLY )
{
- //FIXME load localized error msg
- MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK );
- SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
+ /* set working directory */
+ hDlgCtrl = GetDlgItem( hwndDlg, 14011 );
+ SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer
);
+ pThis->SetWorkingDirectory(szBuffer);
+ /* set link destination */
+ hDlgCtrl = GetDlgItem( hwndDlg, 14009 );
+ SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer);
+ if ( !SHELL_ExistsFileW(szBuffer) )
+ {
+ //FIXME load localized error msg
+ MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK
);
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE
);
+ return TRUE;
+ }
+ ptr = wcsrchr(szBuffer, L'.');
+ if (ptr && !_wcsnicmp(ptr, L".lnk", 4))
+ {
+ // FIXME load localized error msg
+ MessageBoxW( hwndDlg, L"You cannot create a link to a
shortcut", L"Error", MB_ICONERROR );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE
);
+ return TRUE;
+ }
+
+ pThis->SetPath(szBuffer);
+
+ TRACE("This %p sLinkPath %S\n", pThis, pThis->sLinkPath);
+ pThis->Save(pThis->sLinkPath, TRUE );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
return TRUE;
}
- ptr = wcsrchr(szBuffer, L'.');
- if (ptr && !_wcsnicmp(ptr, L".lnk", 4))
+ break;
+ case WM_COMMAND:
+ switch(LOWORD(wParam))
{
- // FIXME load localized error msg
- MessageBoxW( hwndDlg, L"You cannot create a link to a
shortcut", L"Error", MB_ICONERROR );
- SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
- return TRUE;
+ case 14020:
+ ///
+ /// FIXME
+ /// open target directory
+ ///
+ return TRUE;
+ case 14021:
+ if (pThis->sIcoPath)
+ wcscpy(szBuffer, pThis->sIcoPath);
+ IconIndex = pThis->iIcoNdx;
+ if (PickIconDlg(hwndDlg, szBuffer, MAX_PATH, &IconIndex))
+ {
+ pThis->SetIconLocation(szBuffer, IconIndex);
+ ///
+ /// FIXME redraw icon
+ }
+ return TRUE;
+ case 14022:
+ result = DialogBoxParamW(shell32_hInstance,
MAKEINTRESOURCEW(SHELL_EXTENDED_SHORTCUT_DLG), hwndDlg, ExtendedShortcutProc,
(LPARAM)pThis->bRunAs);
+ if (result == 1 || result == 0)
+ {
+ if (pThis->bRunAs != result )
+ {
+ PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+ }
+
+ pThis->bRunAs = result;
+ }
+ return TRUE;
}
-
- pThis->SetPath(szBuffer);
-
- TRACE("This %p sLinkPath %S\n", pThis, pThis->sLinkPath);
- pThis->Save(pThis->sLinkPath, TRUE );
- SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
- return TRUE;
- }
- break;
- case WM_COMMAND:
- switch(LOWORD(wParam))
- {
- case 14020:
- ///
- /// FIXME
- /// open target directory
- ///
- return TRUE;
- case 14021:
- if (pThis->sIcoPath)
- wcscpy(szBuffer, pThis->sIcoPath);
- IconIndex = pThis->iIcoNdx;
- if (PickIconDlg(hwndDlg, szBuffer, MAX_PATH, &IconIndex))
- {
- pThis->SetIconLocation(szBuffer, IconIndex);
- ///
- /// FIXME redraw icon
- }
- return TRUE;
- case 14022:
- result = DialogBoxParamW(shell32_hInstance,
MAKEINTRESOURCEW(SHELL_EXTENDED_SHORTCUT_DLG), hwndDlg, ExtendedShortcutProc,
(LPARAM)pThis->bRunAs);
- if (result == 1 || result == 0)
- {
- if (pThis->bRunAs != result )
- {
- PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
- }
-
- pThis->bRunAs = result;
- }
- return TRUE;
- }
- switch(HIWORD(wParam))
- {
- case EN_CHANGE:
- PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
- break;
- }
- break;
- default:
- break;
- }
- return FALSE;
+ switch(HIWORD(wParam))
+ {
+ case EN_CHANGE:
+ PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ return FALSE;
}
/**************************************************************************
@@ -2176,35 +2171,35 @@
}
/**************************************************************************
- * IShellLink_ConstructFromFile
+ * IShellLink_ConstructFromFile
*/
HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown *pUnkOuter, REFIID riid,
LPCITEMIDLIST pidl, LPVOID *ppv)
{
- CComPtr<IUnknown> psl;
-
- HRESULT hr = ShellLink::_CreatorClass::CreateInstance(NULL, riid, (void**)&psl);
-
- if (SUCCEEDED(hr))
- {
- CComPtr<IPersistFile> ppf;
-
- *ppv = NULL;
-
- hr = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf);
-
- if (SUCCEEDED(hr))
- {
- WCHAR path[MAX_PATH];
-
- if (SHGetPathFromIDListW(pidl, path))
- hr = ppf->Load(path, 0);
- else
- hr = E_FAIL;
-
- if (SUCCEEDED(hr))
- *ppv = psl.Detach();
- }
- }
-
- return hr;
-}
+ CComPtr<IUnknown> psl;
+
+ HRESULT hr = ShellLink::_CreatorClass::CreateInstance(NULL, riid, (void**)&psl);
+
+ if (SUCCEEDED(hr))
+ {
+ CComPtr<IPersistFile> ppf;
+
+ *ppv = NULL;
+
+ hr = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf);
+
+ if (SUCCEEDED(hr))
+ {
+ WCHAR path[MAX_PATH];
+
+ if (SHGetPathFromIDListW(pidl, path))
+ hr = ppf->Load(path, 0);
+ else
+ hr = E_FAIL;
+
+ if (SUCCEEDED(hr))
+ *ppv = psl.Detach();
+ }
+ }
+
+ return hr;
+}
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Sat Sep 3
15:37:09 2011
@@ -1,5 +1,5 @@
/*
- * Shell Library Functions
+ * Shell Library Functions
*
* Copyright 1998 Marcus Meissner
* Copyright 2002 Eric Pouech
@@ -90,7 +90,7 @@
if (used < len)
*res++ = *args;
}
-
+
args++;
}
@@ -146,38 +146,38 @@
if (used < len)
*res++ = *args;
}
-
+
args++;
}
}
}
/***********************************************************************
- * SHELL_ArgifyW [Internal]
+ * SHELL_ArgifyW [Internal]
*
* this function is supposed to expand the escape sequences found in the registry
* some diving reported that the following were used:
* + %1, %2... seem to report to parameter of index N in ShellExecute pmts
- * %1 file
- * %2 printer
- * %3 driver
- * %4 port
+ * %1 file
+ * %2 printer
+ * %3 driver
+ * %4 port
* %I address of a global item ID (explorer switch /idlist)
* %L seems to be %1 as long filename followed by the 8+3 variation
* %S ???
* %* all following parameters (see batfile)
*
-* The way we parse the command line arguments was determined through extensive
-* testing and can be summed up by the following rules"
-*
-* - %2
-* - if first letter is " break on first non literal " and include any
white spaces
-* - if first letter is NOT " break on first " or white space
-* - if " is opened any pair of consecutive " results in ONE literal
"
-*
-* - %~2
-* - use rules from here
http://www.autohotkey.net/~deleyd/parameters/parameters.htm
-*/
+ * The way we parse the command line arguments was determined through extensive
+ * testing and can be summed up by the following rules"
+ *
+ * - %2
+ * - if first letter is " break on first non literal " and include any
white spaces
+ * - if first letter is NOT " break on first " or white space
+ * - if " is opened any pair of consecutive " results in ONE literal
"
+ *
+ * - %~2
+ * - use rules from here http://www.autohotkey.net/~deleyd/parameters/parameters.htm
+ */
static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* lpFile,
LPITEMIDLIST pidl, LPCWSTR args, DWORD* out_len)
{
@@ -285,47 +285,47 @@
*/
case 'l':
case 'L':
- if (lpFile)
+ if (lpFile)
{
- used += wcslen(lpFile);
- if (used < len)
- {
- wcscpy(res, lpFile);
- res += wcslen(lpFile);
- }
- }
- found_p1 = TRUE;
+ used += wcslen(lpFile);
+ if (used < len)
+ {
+ wcscpy(res, lpFile);
+ res += wcslen(lpFile);
+ }
+ }
+ found_p1 = TRUE;
break;
case 'i':
case 'I':
- if (pidl)
+ if (pidl)
{
- DWORD chars = 0;
- /* %p should not exceed 8, maybe 16 when looking forward to 64bit.
- * allowing a buffer of 100 should more than exceed all needs */
- WCHAR buf[100];
- LPVOID pv;
- HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0);
- pv = SHLockShared(hmem, 0);
- chars = swprintf(buf, wszILPtr, pv);
-
+ DWORD chars = 0;
+ /* %p should not exceed 8, maybe 16 when looking forward to
64bit.
+ * allowing a buffer of 100 should more than exceed all needs
*/
+ WCHAR buf[100];
+ LPVOID pv;
+ HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0);
+ pv = SHLockShared(hmem, 0);
+ chars = swprintf(buf, wszILPtr, pv);
+
if (chars >= sizeof(buf)/sizeof(WCHAR))
- ERR("pidl format buffer too small!\n");
-
+ ERR("pidl format buffer too small!\n");
+
used += chars;
-
+
if (used < len)
- {
- wcscpy(res,buf);
- res += chars;
- }
- SHUnlockShared(pv);
- }
+ {
+ wcscpy(res,buf);
+ res += chars;
+ }
+ SHUnlockShared(pv);
+ }
found_p1 = TRUE;
break;
- default:
+ default:
/*
* Check if this is an env-variable here...
*/
@@ -403,23 +403,23 @@
if (SUCCEEDED(hr))
{
- hr = desktop->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret);
-
- if (SUCCEEDED(hr))
- StrRetToStrNW(pszPath, uOutSize, &strret, pidl);
-
- desktop->Release();
+ hr = desktop->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret);
+
+ if (SUCCEEDED(hr))
+ StrRetToStrNW(pszPath, uOutSize, &strret, pidl);
+
+ desktop->Release();
}
return hr;
}
/*************************************************************************
- * SHELL_ExecuteW [Internal]
+ * SHELL_ExecuteW [Internal]
*
*/
static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
- const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out)
+ const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out)
{
STARTUPINFOW startup;
PROCESS_INFORMATION info;
@@ -446,16 +446,16 @@
if ( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir)))
if ( !SetCurrentDirectoryW( lpDirectory))
ERR("cannot set directory %s\n", debugstr_w(lpDirectory));
-
+
ZeroMemory(&startup,sizeof(STARTUPINFOW));
startup.cb = sizeof(STARTUPINFOW);
startup.dwFlags = STARTF_USESHOWWINDOW;
startup.wShowWindow = psei->nShow;
dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
-
+
if (psei->fMask & SEE_MASK_NO_CONSOLE)
dwCreationFlags |= CREATE_NEW_CONSOLE;
-
+
//DbgPrint("[shell32, SHELL_ExecuteW] CreateProcessW cmd = %ws\n",
(LPWSTR)lpCmd);
//DbgBreakPoint();
@@ -468,7 +468,7 @@
if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %d\n", GetLastError() );
retval = 33;
-
+
if (psei->fMask & SEE_MASK_NOCLOSEPROCESS)
psei_out->hProcess = info.hProcess;
else
@@ -484,7 +484,7 @@
TRACE("returning %lu\n", retval);
psei_out->hInstApp = (HINSTANCE)retval;
-
+
if( gcdret )
if( !SetCurrentDirectoryW( curdir))
ERR("cannot return to directory %s\n", debugstr_w(curdir));
@@ -494,7 +494,7 @@
/***********************************************************************
- * SHELL_BuildEnvW [Internal]
+ * SHELL_BuildEnvW [Internal]
*
* Build the environment for the new process, adding the specified
* path to the PATH variable. Returned pointer must be freed by caller.
@@ -552,7 +552,7 @@
/***********************************************************************
- * SHELL_TryAppPathW [Internal]
+ * SHELL_TryAppPathW [Internal]
*
* Helper function for SHELL_FindExecutable
* @param lpResult - pointer to a buffer of size MAX_PATH
@@ -562,7 +562,7 @@
static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env)
{
static const WCHAR wszKeyAppPaths[] =
{'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',
- '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','
','P','a','t','h','s','\\',0};
+
'\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','
','P','a','t','h','s','\\',0};
static const WCHAR wPath[] = {'P','a','t','h',0};
HKEY hkApp = 0;
WCHAR buffer[1024];
@@ -613,12 +613,12 @@
if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, command,
&commandlen) == ERROR_SUCCESS)
{
- commandlen /= sizeof(WCHAR);
+ commandlen /= sizeof(WCHAR);
if (key) wcscpy(key, filetype);
#if 0
LPWSTR tmp;
WCHAR param[256];
- LONG paramlen = sizeof(param);
+ LONG paramlen = sizeof(param);
static const WCHAR wSpace[] = {' ',0};
/* FIXME: it seems all Windows version don't behave the same here.
@@ -626,31 +626,31 @@
* the exec names.
* on Win98, it doesn't appear, but I think it does on Win2k
*/
- /* Get the parameters needed by the application
- from the associated ddeexec key */
- tmp = strstrW(filetype, wCommand);
- tmp[0] = '\0';
- wcscat(filetype, wDdeexec);
- if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, param,
- ¶mlen) == ERROR_SUCCESS)
- {
- paramlen /= sizeof(WCHAR);
+ /* Get the parameters needed by the application
+ from the associated ddeexec key */
+ tmp = strstrW(filetype, wCommand);
+ tmp[0] = '\0';
+ wcscat(filetype, wDdeexec);
+ if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, param,
+ ¶mlen) == ERROR_SUCCESS)
+ {
+ paramlen /= sizeof(WCHAR);
wcscat(command, wSpace);
wcscat(command, param);
commandlen += paramlen;
- }
+ }
#endif
- command[commandlen] = '\0';
-
- return 33; /* FIXME see SHELL_FindExecutable() */
+ command[commandlen] = '\0';
+
+ return 33; /* FIXME see SHELL_FindExecutable() */
}
return SE_ERR_NOASSOC;
}
/*************************************************************************
- * SHELL_FindExecutable [Internal]
+ * SHELL_FindExecutable [Internal]
*
* Utility for code sharing between FindExecutable and ShellExecute
* in:
@@ -664,7 +664,7 @@
* on the operation)
*/
static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
- LPWSTR lpResult, DWORD resultLen, LPWSTR key, WCHAR
**env, LPITEMIDLIST pidl, LPCWSTR args)
+ LPWSTR lpResult, DWORD resultLen, LPWSTR key, WCHAR
**env,LPITEMIDLIST pidl, LPCWSTR args)
{
static const WCHAR wWindows[] =
{'w','i','n','d','o','w','s',0};
static const WCHAR wPrograms[] =
{'p','r','o','g','r','a','m','s',0};
@@ -778,9 +778,9 @@
&filetypelen) == ERROR_SUCCESS)
{
filetypelen /= sizeof(WCHAR);
- if (filetypelen == sizeof(filetype)/sizeof(WCHAR))
- filetypelen--;
-
+ if (filetypelen == sizeof(filetype)/sizeof(WCHAR))
+ filetypelen--;
+
filetype[filetypelen] = '\0';
TRACE("File type: %s\n", debugstr_w(filetype));
}
@@ -797,41 +797,41 @@
filetype[filetypelen] = '\0';
retval = SHELL_FindExecutableByOperation(lpOperation, key, filetype, command,
sizeof(command));
- if (retval > 32)
- {
- DWORD finishedLen;
- SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args,
&finishedLen);
- if (finishedLen > resultLen)
- ERR("Argify buffer not large enough.. truncated\n");
+ if (retval > 32)
+ {
+ DWORD finishedLen;
+ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args,
&finishedLen);
+ if (finishedLen > resultLen)
+ ERR("Argify buffer not large enough.. truncated\n");
DbgPrint("[shell32, SHELL_FindExecutable] Remove double quotation marks
and command line arguments\n");
- /* Remove double quotation marks and command line arguments */
- if (*lpResult == '"')
- {
- WCHAR *p = lpResult;
- while (*(p + 1) != '"')
- {
- *p = *(p + 1);
- p++;
- }
- *p = '\0';
- }
+ /* Remove double quotation marks and command line arguments */
+ if (*lpResult == '"')
+ {
+ WCHAR *p = lpResult;
+ while (*(p + 1) != '"')
+ {
+ *p = *(p + 1);
+ p++;
+ }
+ *p = '\0';
+ }
else
{
/* Truncate on first space */
- WCHAR *p = lpResult;
- while (*p != ' ' && *p != '\0')
+ WCHAR *p = lpResult;
+ while (*p != ' ' && *p != '\0')
p++;
*p='\0';
}
- }
+ }
}
else /* Check win.ini */
{
- static const WCHAR wExtensions[] =
{'e','x','t','e','n','s','i','o','n','s',0};
-
- /* Toss the leading dot */
- extension++;
- if (GetProfileStringW(wExtensions, extension, wszEmpty, command,
sizeof(command)/sizeof(WCHAR)) > 0)
+ static const WCHAR wExtensions[] =
{'e','x','t','e','n','s','i','o','n','s',0};
+
+ /* Toss the leading dot */
+ extension++;
+ if (GetProfileStringW(wExtensions, extension, wszEmpty, command,
sizeof(command)/sizeof(WCHAR)) > 0)
{
if (wcslen(command) != 0)
{
@@ -857,7 +857,7 @@
}
/******************************************************************
- * dde_cb
+ * dde_cb
*
* callback for the DDE connection. not really useful
*/
@@ -871,7 +871,7 @@
}
/******************************************************************
- * dde_connect
+ * dde_connect
*
* ShellExecute helper. Used to do an operation with a DDE connection
*
@@ -881,7 +881,7 @@
*/
static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec,
const WCHAR* lpFile, WCHAR *env,
- LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc,
+ LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32
execfunc,
const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out)
{
static const WCHAR wApplication[] =
{'\\','a','p','p','l','i','c','a','t','i','o','n',0};
@@ -1011,8 +1011,7 @@
* error DMLERR_NOTPROCESSED on XTYP_EXECUTE request.
*/
if (unicode)
- hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR),
hConv, 0L, 0,
- XTYP_EXECUTE, 30000, &tid);
+ hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR),
hConv, 0L, 0, XTYP_EXECUTE, 30000, &tid);
else
{
DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL);
@@ -1037,12 +1036,12 @@
}
/*************************************************************************
- * execute_from_key [Internal]
+ * execute_from_key [Internal]
*/
-static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR
szCommandline,
- LPCWSTR executable_name,
- SHELL_ExecuteW32 execfunc,
- LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
+static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env,
+ LPCWSTR szCommandline, LPCWSTR executable_name,
+ SHELL_ExecuteW32 execfunc,
+ LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
{
static const WCHAR wCommand[] =
{'c','o','m','m','a','n','d',0};
static const WCHAR wDdeexec[] =
{'d','d','e','e','x','e','c',0};
@@ -1065,8 +1064,8 @@
/* Is there a replace() function anywhere? */
cmdlen /= sizeof(WCHAR);
- if (cmdlen >= sizeof(cmd)/sizeof(WCHAR))
- cmdlen = sizeof(cmd)/sizeof(WCHAR)-1;
+ if (cmdlen >= sizeof(cmd)/sizeof(WCHAR))
+ cmdlen = sizeof(cmd)/sizeof(WCHAR)-1;
cmd[cmdlen] = '\0';
SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile,
(LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen);
if (resultLen > sizeof(param)/sizeof(WCHAR))
@@ -1097,7 +1096,7 @@
}
/*************************************************************************
- * FindExecutableA [SHELL32.@]
+ * FindExecutableA [SHELL32.@]
*/
HINSTANCE WINAPI FindExecutableA(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResult)
{
@@ -1118,7 +1117,7 @@
}
/*************************************************************************
- * FindExecutableW [SHELL32.@]
+ * FindExecutableW [SHELL32.@]
*
* This function returns the executable associated with the specified file
* for the default verb.
@@ -1151,7 +1150,7 @@
lpResult[0] = '\0'; /* Start off with an empty return string */
if (lpFile == NULL)
- return (HINSTANCE)SE_ERR_FNF;
+ return (HINSTANCE)SE_ERR_FNF;
if (lpDirectory)
{
@@ -1378,7 +1377,7 @@
/*************************************************************************
- * ShellExecute_FromContextMenu [Internal]
+ * ShellExecute_FromContextMenu [Internal]
*/
static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei )
{
@@ -1528,9 +1527,9 @@
strcatW(wszQuotedCmd, wSpace);
strcatW(wszQuotedCmd, wszParameters);
}
-
+
TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName),
debugstr_w(psei->lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol));
-
+
if (*lpstrProtocol)
retval = execute_from_key(lpstrProtocol, wszApplicationName, env,
psei->lpParameters, wcmd, execfunc, psei, psei_out);
else
@@ -1605,7 +1604,7 @@
}
/*************************************************************************
- * SHELL_execute [Internal]
+ * SHELL_execute [Internal]
*/
BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
{
@@ -1625,7 +1624,7 @@
DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR);
DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR);
DWORD len;
- SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */
+ SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */
WCHAR wfileName[MAX_PATH];
WCHAR *env;
WCHAR lpstrProtocol[256];
@@ -1656,14 +1655,14 @@
DWORD l = strlenW(sei_tmp.lpFile+1);
if(l >= dwApplicationNameLen)
dwApplicationNameLen = l+1;
-
+
wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
dwApplicationNameLen*sizeof(WCHAR));
memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR));
-
+
if (wszApplicationName[l-1] == '\"')
wszApplicationName[l-1] = '\0';
appKnownSingular = TRUE;
-
+
TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName));
}
else
@@ -1683,10 +1682,10 @@
wszParameters = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
parametersLen = len;
}
- strcpyW(wszParameters, sei_tmp.lpParameters);
+ strcpyW(wszParameters, sei_tmp.lpParameters);
}
else
- *wszParameters = '\0';
+ *wszParameters = '\0';
wszDir = dirBuffer;
if (sei_tmp.lpDirectory)
@@ -1697,10 +1696,10 @@
wszDir = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
dirLen = len;
}
- strcpyW(wszDir, sei_tmp.lpDirectory);
+ strcpyW(wszDir, sei_tmp.lpDirectory);
}
else
- *wszDir = '\0';
+ *wszDir = '\0';
/* adjust string pointers to point to the new buffers */
sei_tmp.lpFile = wszApplicationName;
@@ -1715,26 +1714,26 @@
/* process the IDList */
if (sei_tmp.fMask & SEE_MASK_IDLIST)
{
- IShellExecuteHookW* pSEH;
-
- HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_IShellExecuteHookW,
(LPVOID*)&pSEH, NULL);
-
- if (SUCCEEDED(hr))
- {
- hr = pSEH->Execute(&sei_tmp);
-
- pSEH->Release();
-
- if (hr == S_OK)
+ IShellExecuteHookW* pSEH;
+
+ HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList,
IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL);
+
+ if (SUCCEEDED(hr))
+ {
+ hr = pSEH->Execute(&sei_tmp);
+
+ pSEH->Release();
+
+ if (hr == S_OK)
{
HeapFree(GetProcessHeap(), 0, wszApplicationName);
if (wszParameters != parametersBuffer)
HeapFree(GetProcessHeap(), 0, wszParameters);
if (wszDir != dirBuffer)
HeapFree(GetProcessHeap(), 0, wszDir);
- return TRUE;
+ return TRUE;
}
- }
+ }
SHGetPathFromIDListW((LPCITEMIDLIST)sei_tmp.lpIDList, wszApplicationName);
appKnownSingular = TRUE;
@@ -1842,67 +1841,67 @@
/* separate out command line arguments from executable file name */
if (!*sei_tmp.lpParameters && !appKnownSingular)
{
- /* If the executable path is quoted, handle the rest of the command line as
parameters. */
- if (sei_tmp.lpFile[0] == '"')
- {
- LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1;
- LPWSTR dst = wfileName;
- LPWSTR end;
-
- /* copy the unquoted executable path to 'wfileName' */
- while(*src && *src!='"')
- *dst++ = *src++;
-
- *dst = '\0';
-
- if (*src == '"')
+ /* If the executable path is quoted, handle the rest of the command line as
parameters. */
+ if (sei_tmp.lpFile[0] == '"')
+ {
+ LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1;
+ LPWSTR dst = wfileName;
+ LPWSTR end;
+
+ /* copy the unquoted executable path to 'wfileName' */
+ while(*src && *src!='"')
+ *dst++ = *src++;
+
+ *dst = '\0';
+
+ if (*src == '"')
{
- end = ++src;
-
- while(isspace(*src))
- ++src;
- }
+ end = ++src;
+
+ while(isspace(*src))
+ ++src;
+ }
else
- end = src;
-
- /* copy the parameter string to 'wszParameters' */
- strcpyW(wszParameters, src);
-
- /* terminate previous command string after the quote character */
- *end = '\0';
- }
- else
- {
- /* If the executable name is not quoted, we have to use this search loop here,
- that in CreateProcess() is not sufficient because it does not handle shell
links. */
- WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH];
- LPWSTR space, s;
-
- LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/;
- for(s=beg; (space= const_cast<LPWSTR>(strchrW(s, ' ')));
s=space+1)
+ end = src;
+
+ /* copy the parameter string to 'wszParameters' */
+ strcpyW(wszParameters, src);
+
+ /* terminate previous command string after the quote character */
+ *end = '\0';
+ }
+ else
+ {
+ /* If the executable name is not quoted, we have to use this search loop
here,
+ that in CreateProcess() is not sufficient because it does not handle shell
links. */
+ WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH];
+ LPWSTR space, s;
+
+ LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/;
+ for(s=beg; (space= const_cast<LPWSTR>(strchrW(s, ' ')));
s=space+1)
{
- int idx = space-sei_tmp.lpFile;
- memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR));
- buffer[idx] = '\0';
-
- /*FIXME This finds directory paths if the targeted file name contains spaces.
*/
- if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer,
wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL))
- {
- /* separate out command from parameter string */
- LPCWSTR p = space + 1;
-
- while(isspaceW(*p))
- ++p;
-
- strcpyW(wszParameters, p);
- *space = '\0';
-
- break;
- }
- }
+ int idx = space-sei_tmp.lpFile;
+ memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR));
+ buffer[idx] = '\0';
+
+ /*FIXME This finds directory paths if the targeted file name contains
spaces. */
+ if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer,
wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL))
+ {
+ /* separate out command from parameter string */
+ LPCWSTR p = space + 1;
+
+ while(isspaceW(*p))
+ ++p;
+
+ strcpyW(wszParameters, p);
+ *space = '\0';
+
+ break;
+ }
+ }
lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR));
- }
+ }
}
else
lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR));
@@ -2021,7 +2020,7 @@
}
/*************************************************************************
- * ShellExecuteA [SHELL32.290]
+ * ShellExecuteA [SHELL32.290]
*/
HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile,
LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd)
@@ -2051,7 +2050,7 @@
}
/*************************************************************************
- * ShellExecuteExA [SHELL32.292]
+ * ShellExecuteExA [SHELL32.292]
*
*/
BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei)
@@ -2065,7 +2064,7 @@
memcpy(&seiW, sei, sizeof(SHELLEXECUTEINFOW));
if (sei->lpVerb)
- seiW.lpVerb = __SHCloneStrAtoW(&wVerb, sei->lpVerb);
+ seiW.lpVerb = __SHCloneStrAtoW(&wVerb, sei->lpVerb);
if (sei->lpFile)
seiW.lpFile = __SHCloneStrAtoW(&wFile, sei->lpFile);
@@ -2098,7 +2097,7 @@
}
/*************************************************************************
- * ShellExecuteExW [SHELL32.293]
+ * ShellExecuteExW [SHELL32.293]
*
*/
BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei)
@@ -2107,7 +2106,7 @@
}
/*************************************************************************
- * ShellExecuteW [SHELL32.294]
+ * ShellExecuteW [SHELL32.294]
* from shellapi.h
* WINSHELLAPI HINSTANCE APIENTRY ShellExecuteW(HWND hwnd, LPCWSTR lpOperation,
* LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd);
@@ -2137,7 +2136,7 @@
}
/*************************************************************************
- * WOWShellExecute [SHELL32.@]
+ * WOWShellExecute [SHELL32.@]
*
* FIXME: the callback function most likely doesn't work the same way on Windows.
*/
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Sep 3
15:37:09 2011
@@ -143,7 +143,7 @@
DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX |
DT_PATH_ELLIPSIS | DT_WORDBREAK);
SelectObject(hdc, hOldFont);
EndPaint(hDlg, &ps);
-
+
return TRUE;
}
@@ -184,7 +184,7 @@
confirm_msg_move_button(hDlg, IDNO, &xPos, yOffset, TRUE);
confirm_msg_move_button(hDlg, IDD_YESTOALL, &xPos, yOffset, info->bYesToAll);
confirm_msg_move_button(hDlg, IDYES, &xPos, yOffset, TRUE);
-
+
return TRUE;
}
@@ -712,12 +712,12 @@
}
ShowWindow(hwnd, SW_SHOWNORMAL);
- while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
- {
- if (!IsWindow(hwnd) || !IsDialogMessage(hwnd, &msg))
- {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
+ while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
+ {
+ if (!IsWindow(hwnd) || !IsDialogMessage(hwnd, &msg))
+ {
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
}
}
@@ -936,7 +936,7 @@
dwAttr = wfd.dwFileAttributes;
break;
} while (FindNextFileW(hFind, &wfd));
-
+
FindClose(hFind);
}
return dwAttr;
@@ -964,7 +964,7 @@
aSize += size;
aString += size;
} while ((size != 1) && more);
-
+
/* The two sizes might be different in the case of multibyte chars */
size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0);
if (*wString) /* only in the second loop */
@@ -1100,16 +1100,16 @@
if (*pdwListIndex >= flList->num_alloc)
grow_list( flList );
-
+
szFullPath = wildcard_to_file(szFile, wfd.cFileName);
file = &flList->feFiles[(*pdwListIndex)++];
add_file_to_entry(file, szFullPath);
file->bFromWildcard = TRUE;
file->attributes = wfd.dwFileAttributes;
-
+
if (IsAttribDir(file->attributes))
flList->bAnyDirectories = TRUE;
-
+
HeapFree(GetProcessHeap(), 0, szFullPath);
}
@@ -1135,7 +1135,7 @@
/* empty list */
if (!szFiles[0])
return ERROR_ACCESS_DENIED;
-
+
flList->feFiles = (FILE_ENTRY *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
flList->num_alloc * sizeof(FILE_ENTRY));
@@ -1169,10 +1169,10 @@
add_file_to_entry(file, szCurFile);
file->attributes = GetFileAttributesW( file->szFullPath );
file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES);
-
+
if (!file->bExists)
flList->bAnyDontExist = TRUE;
-
+
if (IsAttribDir(file->attributes))
flList->bAnyDirectories = TRUE;
}
@@ -1244,7 +1244,7 @@
/* Don't ask the user about overwriting files when he accepted to overwrite the
folder. FIXME: this is not exactly what Windows does - e.g. there would be
an additional confirmation for a nested folder */
- fileOp.fFlags |= FOF_NOCONFIRMATION;
+ fileOp.fFlags |= FOF_NOCONFIRMATION;
SHFileOperationW(&fileOp);
}
@@ -1509,7 +1509,7 @@
{
// This is a windows 2003 server specific value which ahs been removed.
// Later versions of windows return ERROR_FILE_NOT_FOUND.
- return 1026;
+ return 1026;
}
else
{