Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 54992: [WININET] - Don't use shell32 functions when processing DLL_PROCESS_ATTACH because shell32.dll can be initialized later. Fixes shell32+wininet debug spam at boot.
by rharabien＠svn.reactos.org 17 Jan '12

17 Jan '12

Author: rharabien Date: Tue Jan 17 17:59:26 2012 New Revision: 54992 URL: http://svn.reactos.org/svn/reactos?rev=54992&view=rev Log: [WININET] - Don't use shell32 functions when processing DLL_PROCESS_ATTACH because shell32.dll can be initialized later. Fixes shell32+wininet debug spam at boot. Modified: trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Tue Jan 17 17:59:26 2012 @@ -291,8 +291,6 @@ if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; - - URLCacheContainers_CreateDefaults(); WININET_hModule = hinstDLL; Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Tue Jan 17 17:59:26 2012 @@ -182,6 +182,7 @@ /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); +BOOL bDefaultContainersAdded = FALSE; static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); @@ -591,6 +592,9 @@ if(!lpwszUrl) return ERROR_INVALID_PARAMETER; + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { int prefix_len = strlenW(pContainer->cache_prefix); @@ -628,6 +632,9 @@ /* non-NULL search pattern only returns one container ever */ if (lpwszSearchPattern && dwIndex > 0) return FALSE; + + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { @@ -1532,6 +1539,9 @@ return FALSE; } + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { /* The URL cache has prefix L"" (unlike Cookies and History) */ Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Tue Jan 17 17:59:26 2012 @@ -40,7 +40,16 @@ * NETCON_create --- wine-1.3.4/dlls/wininet/internet.c 2010-10-01 14:46:44.000000000 -0400 +++ dll/win32/wininet/internet.c 2010-10-09 15:33:04.000000000 -0400 -@@ -3569,19 +3569,22 @@ +@@ -292,8 +292,6 @@ + if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) + return FALSE; + +- URLCacheContainers_CreateDefaults(); +- + WININET_hModule = hinstDLL; + + case DLL_THREAD_ATTACH: +@@ -3569,19 +3567,22 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { @@ -71,7 +80,15 @@ =================================================================== --- dll/win32/wininet/urlcache.c (revision 50814) +++ dll/win32/wininet/urlcache.c (working copy) -@@ -527,6 +527,7 @@ +@@ -182,6 +182,7 @@ + + /* List of all containers available */ + static struct list UrlContainers = LIST_INIT(UrlContainers); ++BOOL bDefaultContainersAdded = FALSE; + + static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); + +@@ -527,6 +528,7 @@ static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; static const WCHAR CookieSuffix[] = {0}; static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; @@ -79,7 +96,7 @@ static const struct { int nFolder; /* CSIDL_* constant */ -@@ -540,6 +541,12 @@ +@@ -540,6 +542,12 @@ }; DWORD i; @@ -92,6 +109,36 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; +@@ -584,6 +592,9 @@ + if(!lpwszUrl) + return ERROR_INVALID_PARAMETER; + ++ if (!bDefaultContainersAdded) ++ URLCacheContainers_CreateDefaults(); ++ + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + { + int prefix_len = strlenW(pContainer->cache_prefix); +@@ -622,6 +633,9 @@ + if (lpwszSearchPattern && dwIndex > 0) + return FALSE; + ++ if (!bDefaultContainersAdded) ++ URLCacheContainers_CreateDefaults(); ++ + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + { + if (lpwszSearchPattern) +@@ -1525,6 +1539,9 @@ + return FALSE; + } + ++ if (!bDefaultContainersAdded) ++ URLCacheContainers_CreateDefaults(); ++ + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + { + /* The URL cache has prefix L"" (unlike Cookies and History) */ Index: dll/win32/wininet/http.c =================================================================== --- dll/win32/wininet/http.c (revision 54234)

1 0

[rharabien] 54991: [SHELL32] - Improve formatting in shelllink.cpp - Load shortcut icon in property page
by rharabien＠svn.reactos.org 17 Jan '12

17 Jan '12

Author: rharabien Date: Tue Jan 17 17:57:23 2012 New Revision: 54991 URL: http://svn.reactos.org/svn/reactos?rev=54991&view=rev Log: [SHELL32] - Improve formatting in shelllink.cpp - Load shortcut icon in property page Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Tue Jan 17 17:57:23 2012 @@ -95,26 +95,26 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ -static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static LPWSTR __inline HEAP_strdupAtoW(HANDLE heap, DWORD flags, LPCSTR str) { INT len; LPWSTR p; assert(str); - len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - p = (LPWSTR)HeapAlloc( heap, flags, len*sizeof (WCHAR) ); - if( !p ) + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + p = (LPWSTR)HeapAlloc(heap, flags, len * sizeof(WCHAR)); + if (!p) return p; - MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); + MultiByteToWideChar(CP_ACP, 0, str, -1, p, len); return p; } -static LPWSTR __inline strdupW( LPCWSTR src ) +static LPWSTR __inline strdupW(LPCWSTR src) { LPWSTR dest; if (!src) return NULL; - dest = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, (wcslen(src)+1)*sizeof(WCHAR) ); + dest = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(src) + 1) * sizeof(WCHAR)); if (dest) wcscpy(dest, src); return dest; @@ -159,7 +159,7 @@ ILFree(pPidl); } -HRESULT WINAPI CShellLink::GetClassID(CLSID *pclsid ) +HRESULT WINAPI CShellLink::GetClassID(CLSID *pclsid) { TRACE("%p %p\n", this, pclsid); @@ -171,7 +171,7 @@ HRESULT WINAPI CShellLink::IsDirty() { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); if (bDirty) return S_OK; @@ -181,63 +181,57 @@ HRESULT WINAPI CShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode) { - HRESULT r; - CComPtr<IStream> stm; - - TRACE("(%p, %s, %x)\n",this, debugstr_w(pszFileName), dwMode); + 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)) + + CComPtr<IStream> stm; + HRESULT hr = SHCreateStreamOnFileW(pszFileName, dwMode, &stm); + if (SUCCEEDED(hr)) { HeapFree(GetProcessHeap(), 0, sLinkPath); sLinkPath = strdupW(pszFileName); - r = Load(stm); + hr = Load(stm); ShellLink_UpdatePath(sPathRel, pszFileName, sWorkDir, &sPath); bDirty = FALSE; } - TRACE("-- returning hr %08x\n", r); - return r; + TRACE("-- returning hr %08x\n", hr); + return hr; } HRESULT WINAPI CShellLink::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 ) ) + CComPtr<IStream> stm; + HRESULT hr = SHCreateStreamOnFileW(pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm); + if (SUCCEEDED(hr)) + { + hr = Save(stm, FALSE); + + if (SUCCEEDED(hr)) { - if ( sLinkPath ) - { + if (sLinkPath) HeapFree(GetProcessHeap(), 0, sLinkPath); - } - sLinkPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName)+1) * sizeof(WCHAR)); - if ( sLinkPath ) - { + + sLinkPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName) + 1) * sizeof(WCHAR)); + if (sLinkPath) wcscpy(sLinkPath, pszFileName); - } bDirty = FALSE; } else { - DeleteFileW( pszFileName ); - WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName) ); + DeleteFileW(pszFileName); + WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName)); } } - return r; + return hr; } HRESULT WINAPI CShellLink::SaveCompleted(LPCOLESTR pszFileName) @@ -250,13 +244,13 @@ { *ppszFileName = NULL; - if ( !sLinkPath) + if (!sLinkPath) { /* IPersistFile::GetCurFile called before IPersistFile::Save */ return S_FALSE; } - *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(sLinkPath)+1) * sizeof(WCHAR)); + *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(sLinkPath) + 1) * sizeof(WCHAR)); if (!*ppszFileName) { /* out of memory */ @@ -273,50 +267,46 @@ * IPersistStream_IsDirty (IPersistStream) */ -static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr ) -{ - DWORD count; +static HRESULT Stream_LoadString(IStream* stm, BOOL unicode, LPWSTR *pstr) +{ + TRACE("%p\n", stm); + USHORT len; - LPSTR temp; - LPWSTR str; - HRESULT r; - - TRACE("%p\n", stm); - - count = 0; - r = stm->Read(&len, sizeof(len), &count); - if ( FAILED (r) || ( count != sizeof(len) ) ) + DWORD count = 0; + HRESULT hr = stm->Read(&len, sizeof(len), &count); + if (FAILED(hr) || count != sizeof(len)) return E_FAIL; - if( unicode ) + if (unicode) len *= sizeof (WCHAR); TRACE("reading %d\n", len); - temp = (LPSTR)HeapAlloc(GetProcessHeap(), 0, len+sizeof(WCHAR)); - if( !temp ) + LPSTR temp = (LPSTR)HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (!temp) return E_OUTOFMEMORY; count = 0; - r = stm->Read(temp, len, &count); - if( FAILED (r) || ( count != len ) ) - { - HeapFree( GetProcessHeap(), 0, temp ); + hr = stm->Read(temp, len, &count); + if(FAILED(hr) || count != len) + { + HeapFree(GetProcessHeap(), 0, temp); return E_FAIL; } - TRACE("read %s\n", debugstr_an(temp,len)); + TRACE("read %s\n", debugstr_an(temp, len)); /* convert to unicode if necessary */ - if( !unicode ) - { - count = MultiByteToWideChar( CP_ACP, 0, temp, len, NULL, 0 ); - str = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) ); - if( !str ) + LPWSTR str; + if (!unicode) + { + count = MultiByteToWideChar(CP_ACP, 0, temp, len, NULL, 0); + str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (count + 1) * sizeof (WCHAR)); + if (!str) { - HeapFree( GetProcessHeap(), 0, temp ); + HeapFree(GetProcessHeap(), 0, temp); return E_OUTOFMEMORY; } - MultiByteToWideChar( CP_ACP, 0, temp, len, str, count ); - HeapFree( GetProcessHeap(), 0, temp ); + MultiByteToWideChar(CP_ACP, 0, temp, len, str, count); + HeapFree(GetProcessHeap(), 0, temp); } else { @@ -330,117 +320,110 @@ return S_OK; } -static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) -{ - DWORD size; - ULONG count; - HRESULT r; - struct sized_chunk { +static HRESULT Stream_ReadChunk(IStream* stm, LPVOID *data) +{ + struct sized_chunk + { DWORD size; unsigned char data[1]; } *chunk; - TRACE("%p\n",stm); - - r = stm->Read(&size, sizeof(size), &count ); - if( FAILED( r ) || count != sizeof(size) ) + TRACE("%p\n", stm); + + DWORD size; + ULONG count; + HRESULT hr = stm->Read(&size, sizeof(size), &count); + if (FAILED(hr) || count != sizeof(size)) return E_FAIL; - chunk = (sized_chunk *)HeapAlloc( GetProcessHeap(), 0, size ); - if( !chunk ) + chunk = (sized_chunk *)HeapAlloc(GetProcessHeap(), 0, size); + if (!chunk) return E_OUTOFMEMORY; chunk->size = size; - r = stm->Read(chunk->data, size - sizeof(size), &count ); - if( FAILED( r ) || count != (size - sizeof(size)) ) - { - HeapFree( GetProcessHeap(), 0, chunk ); + hr = stm->Read(chunk->data, size - sizeof(size), &count); + if (FAILED(hr) || count != (size - sizeof(size))) + { + HeapFree(GetProcessHeap(), 0, chunk); return E_FAIL; } - TRACE("Read %d bytes\n",chunk->size); + TRACE("Read %d bytes\n", chunk->size); *data = chunk; return S_OK; } -static BOOL Stream_LoadVolume( LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *volume ) -{ - const int label_sz = sizeof volume->label/sizeof volume->label[0]; - LPSTR label; - int len; - +static BOOL Stream_LoadVolume(LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *volume) +{ volume->serial = vol->dwVolSerial; volume->type = vol->dwType; - if( !vol->dwVolLabelOfs ) + if (!vol->dwVolLabelOfs) return FALSE; - if( vol->dwSize <= vol->dwVolLabelOfs ) + if (vol->dwSize <= vol->dwVolLabelOfs) return FALSE; - len = vol->dwSize - vol->dwVolLabelOfs; - - label = (LPSTR) vol; + INT len = vol->dwSize - vol->dwVolLabelOfs; + + LPSTR label = (LPSTR)vol; label += vol->dwVolLabelOfs; - MultiByteToWideChar( CP_ACP, 0, label, len, volume->label, label_sz-1); + MultiByteToWideChar(CP_ACP, 0, label, len, volume->label, _countof(volume->label)); return TRUE; } -static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) -{ - unsigned int len = 0, wlen; - LPWSTR path; - - while( p[len] && (len < maxlen) ) +static LPWSTR Stream_LoadPath(LPCSTR p, DWORD maxlen) +{ + UINT len = 0; + + while (p[len] && len < maxlen) len++; - wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); - path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wlen+1)*sizeof(WCHAR)); + UINT wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); + LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wlen + 1) * sizeof(WCHAR)); + if (!path) + return NULL; MultiByteToWideChar(CP_ACP, 0, p, len, path, wlen); path[wlen] = 0; return path; } -static HRESULT Stream_LoadLocation( IStream *stm, - CShellLink::volume_info *volume, LPWSTR *path ) +static HRESULT Stream_LoadLocation(IStream *stm, + CShellLink::volume_info *volume, LPWSTR *path) { char *p = NULL; - LOCATION_INFO *loc; - HRESULT r; - DWORD n; - - r = Stream_ReadChunk( stm, (LPVOID*) &p ); - if( FAILED(r) ) - return r; - - loc = (LOCATION_INFO*) p; + HRESULT hr = Stream_ReadChunk(stm, (LPVOID*) &p); + if (FAILED(hr)) + return hr; + + LOCATION_INFO *loc = (LOCATION_INFO*) p; if (loc->dwTotalSize < sizeof(LOCATION_INFO)) { - HeapFree( GetProcessHeap(), 0, p ); + HeapFree(GetProcessHeap(), 0, p); return E_FAIL; } /* if there's valid local volume information, load it */ - if( loc->dwVolTableOfs && - ((loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO)) <= loc->dwTotalSize) ) + if (loc->dwVolTableOfs && + ((loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO)) <= loc->dwTotalSize)) { LOCAL_VOLUME_INFO *volume_info; volume_info = (LOCAL_VOLUME_INFO*) &p[loc->dwVolTableOfs]; - Stream_LoadVolume( volume_info, volume ); + Stream_LoadVolume(volume_info, volume); } /* if there's a local path, load it */ - n = loc->dwLocalPathOfs; - if( n && (n < loc->dwTotalSize) ) - *path = Stream_LoadPath( &p[n], loc->dwTotalSize - n ); + DWORD n = loc->dwLocalPathOfs; + if (n && n < loc->dwTotalSize) + *path = Stream_LoadPath(&p[n], loc->dwTotalSize - n); TRACE("type %d serial %08x name %s path %s\n", volume->type, volume->serial, debugstr_w(volume->label), debugstr_w(*path)); - HeapFree( GetProcessHeap(), 0, p ); + HeapFree(GetProcessHeap(), 0, p); return S_OK; } @@ -458,45 +441,42 @@ * In the original Win32 implementation the buffers are not initialized * to zero, so data trailing the string is random garbage. */ -static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) -{ - DWORD size; +static HRESULT Stream_LoadAdvertiseInfo(IStream* stm, LPWSTR *str) +{ + TRACE("%p\n", stm); + ULONG count; - HRESULT r; EXP_DARWIN_LINK buffer; - - TRACE("%p\n",stm); - - r = stm->Read(&buffer.dbh.cbSize, sizeof (DWORD), &count ); - if( FAILED( r ) ) - return r; + HRESULT hr = stm->Read(&buffer.dbh.cbSize, sizeof (DWORD), &count); + if (FAILED(hr)) + return hr; /* make sure that we read the size of the structure even on error */ - size = sizeof buffer - sizeof (DWORD); - if( buffer.dbh.cbSize != sizeof buffer ) + DWORD size = sizeof buffer - sizeof (DWORD); + if (buffer.dbh.cbSize != sizeof buffer) { ERR("Ooops. This structure is not as expected...\n"); return E_FAIL; } - r = stm->Read(&buffer.dbh.dwSignature, size, &count ); - if( FAILED( r ) ) - return r; - - if( count != size ) + hr = stm->Read(&buffer.dbh.dwSignature, size, &count); + if (FAILED(hr)) + return hr; + + if (count != size) return E_FAIL; TRACE("magic %08x string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); - if( (buffer.dbh.dwSignature&0xffff0000) != 0xa0000000 ) + if ((buffer.dbh.dwSignature & 0xffff0000) != 0xa0000000) { ERR("Unknown magic number %08x in advertised shortcut\n", buffer.dbh.dwSignature); return E_FAIL; } - *str = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen(buffer.szwDarwinID)+1) * sizeof(WCHAR) ); - wcscpy( *str, buffer.szwDarwinID ); + *str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(buffer.szwDarwinID) + 1) * sizeof(WCHAR)); + wcscpy(*str, buffer.szwDarwinID); return S_OK; } @@ -506,21 +486,16 @@ */ HRESULT WINAPI CShellLink::Load(IStream *stm) { - LINK_HEADER hdr; - ULONG dwBytesRead; - BOOL unicode; - HRESULT r; - DWORD zero; - TRACE("%p %p\n", this, stm); if (!stm) return STG_E_INVALIDPOINTER; - dwBytesRead = 0; - r = stm->Read(&hdr, sizeof(hdr), &dwBytesRead); - if (FAILED(r)) - return r; + LINK_HEADER hdr; + ULONG dwBytesRead = 0; + HRESULT hr = stm->Read(&hdr, sizeof(hdr), &dwBytesRead); + if (FAILED(hr)) + return hr; if (dwBytesRead != sizeof(hdr)) return E_FAIL; @@ -532,7 +507,7 @@ /* free all the old stuff */ ILFree(pPidl); pPidl = NULL; - memset( &volume, 0, sizeof volume ); + memset(&volume, 0, sizeof volume); HeapFree(GetProcessHeap(), 0, sPath); sPath = NULL; HeapFree(GetProcessHeap(), 0, sDescription); @@ -550,6 +525,7 @@ HeapFree(GetProcessHeap(), 0, sComponent); sComponent = NULL; + BOOL unicode = FALSE; iShowCmd = hdr.fStartup; wHotKey = (WORD)hdr.wHotKey; iIcoNdx = hdr.nIcon; @@ -559,102 +535,105 @@ if (TRACE_ON(shell)) { WCHAR sTemp[MAX_PATH]; - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &time1, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); - TRACE("-- time1: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &time2, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); - TRACE("-- time2: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &time3, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); - TRACE("-- time3: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time1, + NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); + TRACE("-- time1: %s\n", debugstr_w(sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time2, + NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); + TRACE("-- time2: %s\n", debugstr_w(sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time3, + NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); + TRACE("-- time3: %s\n", debugstr_w(sTemp)); } /* load all the new stuff */ - if( hdr.dwFlags & SLDF_HAS_ID_LIST ) - { - r = ILLoadFromStream( stm, &pPidl ); - if( FAILED( r ) ) - return r; + if (hdr.dwFlags & SLDF_HAS_ID_LIST) + { + hr = ILLoadFromStream(stm, &pPidl); + if (FAILED(hr)) + return hr; } pdump(pPidl); /* load the location information */ - if( hdr.dwFlags & SLDF_HAS_LINK_INFO ) - r = Stream_LoadLocation( stm, &volume, &sPath ); - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_LINK_INFO) + hr = Stream_LoadLocation(stm, &volume, &sPath); + if (FAILED(hr)) goto end; - unicode = hdr.dwFlags & SLDF_UNICODE; - if( hdr.dwFlags & SLDF_HAS_NAME ) - { - r = Stream_LoadString( stm, unicode, &sDescription ); - TRACE("Description -> %s\n",debugstr_w(sDescription)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_UNICODE) + unicode = TRUE; + + if (hdr.dwFlags & SLDF_HAS_NAME) + { + hr = Stream_LoadString(stm, unicode, &sDescription); + TRACE("Description -> %s\n", debugstr_w(sDescription)); + } + if (FAILED(hr)) goto end; - if( hdr.dwFlags & SLDF_HAS_RELPATH ) - { - r = Stream_LoadString( stm, unicode, &sPathRel ); - TRACE("Relative Path-> %s\n",debugstr_w(sPathRel)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_RELPATH) + { + hr = Stream_LoadString(stm, unicode, &sPathRel); + TRACE("Relative Path-> %s\n", debugstr_w(sPathRel)); + } + if (FAILED(hr)) goto end; - if( hdr.dwFlags & SLDF_HAS_WORKINGDIR ) - { - r = Stream_LoadString( stm, unicode, &sWorkDir ); - TRACE("Working Dir -> %s\n",debugstr_w(sWorkDir)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_WORKINGDIR) + { + hr = Stream_LoadString(stm, unicode, &sWorkDir); + TRACE("Working Dir -> %s\n", debugstr_w(sWorkDir)); + } + if (FAILED(hr)) goto end; - if( hdr.dwFlags & SLDF_HAS_ARGS ) - { - r = Stream_LoadString( stm, unicode, &sArgs ); - TRACE("Working Dir -> %s\n",debugstr_w(sArgs)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_ARGS) + { + hr = Stream_LoadString(stm, unicode, &sArgs); + TRACE("Working Dir -> %s\n", debugstr_w(sArgs)); + } + if (FAILED(hr)) goto end; - if( hdr.dwFlags & SLDF_HAS_ICONLOCATION ) - { - r = Stream_LoadString( stm, unicode, &sIcoPath ); - TRACE("Icon file -> %s\n",debugstr_w(sIcoPath)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_ICONLOCATION) + { + hr = Stream_LoadString(stm, unicode, &sIcoPath); + TRACE("Icon file -> %s\n", debugstr_w(sIcoPath)); + } + if (FAILED(hr)) goto end; #if (NTDDI_VERSION < NTDDI_LONGHORN) - if( hdr.dwFlags & SLDF_HAS_LOGO3ID ) - { - r = Stream_LoadAdvertiseInfo( stm, &sProduct ); - TRACE("Product -> %s\n",debugstr_w(sProduct)); - } - if( FAILED( r ) ) + if (hdr.dwFlags & SLDF_HAS_LOGO3ID) + { + hr = Stream_LoadAdvertiseInfo(stm, &sProduct); + TRACE("Product -> %s\n", debugstr_w(sProduct)); + } + if (FAILED(hr)) goto end; #endif - if( hdr.dwFlags & SLDF_HAS_DARWINID ) - { - r = Stream_LoadAdvertiseInfo( stm, &sComponent ); - TRACE("Component -> %s\n",debugstr_w(sComponent)); - } - if( hdr.dwFlags & SLDF_RUNAS_USER ) - { - bRunAs = TRUE; + if (hdr.dwFlags & SLDF_HAS_DARWINID) + { + hr = Stream_LoadAdvertiseInfo(stm, &sComponent); + TRACE("Component -> %s\n", debugstr_w(sComponent)); + } + if (hdr.dwFlags & SLDF_RUNAS_USER) + { + bRunAs = TRUE; } else { - bRunAs = FALSE; - } - - if( FAILED( r ) ) + bRunAs = FALSE; + } + + if (FAILED(hr)) goto end; - r = stm->Read(&zero, sizeof zero, &dwBytesRead); - if( FAILED( r ) || zero || dwBytesRead != sizeof zero ) + DWORD dwZero; + hr = stm->Read(&dwZero, sizeof(dwZero), &dwBytesRead); + if (FAILED(hr) || dwZero || dwBytesRead != sizeof(dwZero)) ERR("Last word was not zero\n"); TRACE("OK\n"); @@ -662,8 +641,9 @@ pdump (pPidl); return S_OK; + end: - return r; + return hr; } /************************************************************************ @@ -672,21 +652,20 @@ * Helper function for IPersistStream_Save. Writes a unicode string * with terminating nul byte to a stream, preceded by the its length. */ -static HRESULT Stream_WriteString( IStream* stm, LPCWSTR str ) -{ - USHORT len = wcslen( str ) + 1; +static HRESULT Stream_WriteString(IStream* stm, LPCWSTR str) +{ + USHORT len = wcslen(str) + 1; DWORD count; - HRESULT r; - - r = stm->Write(&len, sizeof(len), &count ); - if( FAILED( r ) ) - return r; + + HRESULT hr = stm->Write(&len, sizeof(len), &count); + if (FAILED(hr)) + return hr; len *= sizeof(WCHAR); - r = stm->Write(str, len, &count ); - if( FAILED( r ) ) - return r; + hr = stm->Write(str, len, &count); + if (FAILED(hr)) + return hr; return S_OK; } @@ -700,33 +679,29 @@ * and the final path. * Figure out how Windows deals with unicode paths here. */ -static HRESULT Stream_WriteLocationInfo( IStream* stm, LPCWSTR path, - CShellLink::volume_info *volume ) -{ - DWORD total_size, path_size, volume_info_size, label_size, final_path_size; +static HRESULT Stream_WriteLocationInfo(IStream* stm, LPCWSTR path, + CShellLink::volume_info *volume) +{ LOCAL_VOLUME_INFO *vol; LOCATION_INFO *loc; - LPSTR szLabel, szPath, szFinalPath; - ULONG count = 0; - HRESULT hr; TRACE("%p %s %p\n", stm, debugstr_w(path), volume); /* figure out the size of everything */ - label_size = WideCharToMultiByte( CP_ACP, 0, volume->label, -1, - NULL, 0, NULL, NULL ); - path_size = WideCharToMultiByte( CP_ACP, 0, path, -1, - NULL, 0, NULL, NULL ); - volume_info_size = sizeof *vol + label_size; - final_path_size = 1; - total_size = sizeof *loc + volume_info_size + path_size + final_path_size; + DWORD label_size = WideCharToMultiByte(CP_ACP, 0, volume->label, -1, + NULL, 0, NULL, NULL); + DWORD path_size = WideCharToMultiByte(CP_ACP, 0, path, -1, + NULL, 0, NULL, NULL); + DWORD volume_info_size = sizeof(*vol) + label_size; + DWORD final_path_size = 1; + DWORD total_size = sizeof(*loc) + volume_info_size + path_size + final_path_size; /* create pointers to everything */ loc = (LOCATION_INFO *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, total_size); vol = (LOCAL_VOLUME_INFO*) &loc[1]; - szLabel = (LPSTR) &vol[1]; - szPath = &szLabel[label_size]; - szFinalPath = &szPath[path_size]; + LPSTR szLabel = (LPSTR) &vol[1]; + LPSTR szPath = &szLabel[label_size]; + LPSTR szFinalPath = &szPath[path_size]; /* fill in the location information header */ loc->dwTotalSize = total_size; @@ -744,41 +719,38 @@ vol->dwVolLabelOfs = sizeof (*vol); /* copy in the strings */ - WideCharToMultiByte( CP_ACP, 0, volume->label, -1, - szLabel, label_size, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, path, -1, - szPath, path_size, NULL, NULL ); + WideCharToMultiByte(CP_ACP, 0, volume->label, -1, + szLabel, label_size, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, path, -1, + szPath, path_size, NULL, NULL); szFinalPath[0] = 0; - hr = stm->Write(loc, total_size, &count ); + ULONG count = 0; + HRESULT hr = stm->Write(loc, total_size, &count); HeapFree(GetProcessHeap(), 0, loc); return hr; } -static EXP_DARWIN_LINK* shelllink_build_darwinid( LPCWSTR string, DWORD magic ) -{ - EXP_DARWIN_LINK *buffer; - - buffer = (EXP_DARWIN_LINK *)LocalAlloc( LMEM_ZEROINIT, sizeof *buffer ); - buffer->dbh.cbSize = sizeof *buffer; +static EXP_DARWIN_LINK* shelllink_build_darwinid(LPCWSTR string, DWORD magic) +{ + EXP_DARWIN_LINK *buffer = (EXP_DARWIN_LINK *)LocalAlloc(LMEM_ZEROINIT, sizeof * buffer); + buffer->dbh.cbSize = sizeof * buffer; buffer->dbh.dwSignature = magic; - lstrcpynW( buffer->szwDarwinID, string, MAX_PATH ); - WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL ); + lstrcpynW(buffer->szwDarwinID, string, MAX_PATH); + WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL); return buffer; } -static HRESULT Stream_WriteAdvertiseInfo( IStream* stm, LPCWSTR string, DWORD magic ) -{ - EXP_DARWIN_LINK *buffer; +static HRESULT Stream_WriteAdvertiseInfo(IStream* stm, LPCWSTR string, DWORD magic) +{ + TRACE("%p\n", stm); + + EXP_DARWIN_LINK *buffer = shelllink_build_darwinid(string, magic); + ULONG count; - - TRACE("%p\n",stm); - - buffer = shelllink_build_darwinid( string, magic ); - - return stm->Write(buffer, buffer->dbh.cbSize, &count ); + return stm->Write(buffer, buffer->dbh.cbSize, &count); } /************************************************************************ @@ -788,13 +760,9 @@ */ HRESULT WINAPI CShellLink::Save(IStream *stm, BOOL fClearDirty) { + TRACE("%p %p %x\n", this, stm, fClearDirty); + LINK_HEADER header; - ULONG count; - DWORD zero; - HRESULT r; - - TRACE("%p %p %x\n", this, stm, fClearDirty); - memset(&header, 0, sizeof(header)); header.dwSize = sizeof(header); header.fStartup = iShowCmd; @@ -803,79 +771,80 @@ header.wHotKey = wHotKey; header.nIcon = iIcoNdx; header.dwFlags = SLDF_UNICODE; /* strings are in unicode */ - if( pPidl ) + if (pPidl) header.dwFlags |= SLDF_HAS_ID_LIST; - if( sPath ) + if (sPath) header.dwFlags |= SLDF_HAS_LINK_INFO; - if( sDescription ) + if (sDescription) header.dwFlags |= SLDF_HAS_NAME; - if( sWorkDir ) + if (sWorkDir) header.dwFlags |= SLDF_HAS_WORKINGDIR; - if( sArgs ) + if (sArgs) header.dwFlags |= SLDF_HAS_ARGS; - if( sIcoPath ) + if (sIcoPath) header.dwFlags |= SLDF_HAS_ICONLOCATION; #if (NTDDI_VERSION < NTDDI_LONGHORN) - if( sProduct ) + if (sProduct) header.dwFlags |= SLDF_HAS_LOGO3ID; #endif - if( sComponent ) + if (sComponent) header.dwFlags |= SLDF_HAS_DARWINID; - if( bRunAs ) + if (bRunAs) header.dwFlags |= SLDF_RUNAS_USER; - SystemTimeToFileTime ( &time1, &header.Time1 ); - SystemTimeToFileTime ( &time2, &header.Time2 ); - SystemTimeToFileTime ( &time3, &header.Time3 ); + SystemTimeToFileTime (&time1, &header.Time1); + SystemTimeToFileTime (&time2, &header.Time2); + SystemTimeToFileTime (&time3, &header.Time3); /* write the Shortcut header */ - r = stm->Write(&header, sizeof(header), &count ); - if( FAILED( r ) ) - { - ERR("Write failed at %d\n",__LINE__); - return r; + ULONG count; + HRESULT hr = stm->Write(&header, sizeof(header), &count); + if (FAILED(hr)) + { + ERR("Write failed\n"); + return hr; } TRACE("Writing pidl\n"); /* write the PIDL to the shortcut */ - if( pPidl ) - { - r = ILSaveToStream( stm, pPidl ); - if( FAILED( r ) ) + if (pPidl) + { + hr = ILSaveToStream(stm, pPidl); + if (FAILED(hr)) { - ERR("Failed to write PIDL at %d\n",__LINE__); - return r; + ERR("Failed to write PIDL\n"); + return hr; } } - if( sPath ) - Stream_WriteLocationInfo( stm, sPath, &volume ); - - if( sDescription ) - r = Stream_WriteString( stm, sDescription ); - - if( sPathRel ) - r = Stream_WriteString( stm, sPathRel ); - - if( sWorkDir ) - r = Stream_WriteString( stm, sWorkDir ); - - if( sArgs ) - r = Stream_WriteString( stm, sArgs ); - - if( sIcoPath ) - r = Stream_WriteString( stm, sIcoPath ); - - if( sProduct ) - r = Stream_WriteAdvertiseInfo( stm, sProduct, EXP_SZ_ICON_SIG ); - - if( sComponent ) - r = Stream_WriteAdvertiseInfo( stm, sComponent, EXP_DARWIN_ID_SIG ); + if (sPath) + Stream_WriteLocationInfo(stm, sPath, &volume); + + if (sDescription) + hr = Stream_WriteString(stm, sDescription); + + if (sPathRel) + hr = Stream_WriteString(stm, sPathRel); + + if (sWorkDir) + hr = Stream_WriteString(stm, sWorkDir); + + if (sArgs) + hr = Stream_WriteString(stm, sArgs); + + if (sIcoPath) + hr = Stream_WriteString(stm, sIcoPath); + + if (sProduct) + hr = Stream_WriteAdvertiseInfo(stm, sProduct, EXP_SZ_ICON_SIG); + + if (sComponent) + hr = Stream_WriteAdvertiseInfo(stm, sComponent, EXP_DARWIN_ID_SIG); /* the last field is a single zero dword */ - zero = 0; - r = stm->Write(&zero, sizeof zero, &count ); + DWORD zero = 0; + hr = stm->Write(&zero, sizeof zero, &count); return S_OK; } @@ -894,6 +863,7 @@ { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(path)) return FALSE; + return TRUE; } @@ -906,25 +876,30 @@ if (!path || !psPath) return E_INVALIDARG; - if (!*psPath && sPathRel) { + 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 */ - GetFullPathNameW( path, MAX_PATH*2, buffer, &final ); - if( !final ) + GetFullPathNameW(path, MAX_PATH * 2, buffer, &final); + if (!final) final = buffer; wcscpy(final, sPathRel); *abs_path = '\0'; - if (SHELL_ExistsFileW(buffer)) { + if (SHELL_ExistsFileW(buffer)) + { if (!GetFullPathNameW(buffer, MAX_PATH, abs_path, &final)) wcscpy(abs_path, buffer); - } else { + } + else + { /* try if [working directory] + [relative path] finds an existing file */ - if (sWorkDir) { + if (sWorkDir) + { wcscpy(buffer, sWorkDir); wcscpy(PathAddBackslashW(buffer), sPathRel); @@ -938,7 +913,7 @@ if (!*abs_path) wcscpy(abs_path, sPathRel); - *psPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(abs_path)+1)*sizeof(WCHAR)); + *psPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(abs_path) + 1) * sizeof(WCHAR)); if (!*psPath) return E_OUTOFMEMORY; @@ -958,8 +933,9 @@ if (cchMaxPath) pszFile[0] = 0; + if (sPath) - WideCharToMultiByte( CP_ACP, 0, sPath, -1, + WideCharToMultiByte(CP_ACP, 0, sPath, -1, pszFile, cchMaxPath, NULL, NULL); if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", this); @@ -969,25 +945,27 @@ HRESULT WINAPI CShellLink::GetIDList(LPITEMIDLIST * ppidl) { - TRACE("(%p)->(ppidl=%p)\n",this, ppidl); + TRACE("(%p)->(ppidl=%p)\n", this, ppidl); if (!pPidl) { *ppidl = NULL; return S_FALSE; } + *ppidl = ILClone(pPidl); return S_OK; } HRESULT WINAPI CShellLink::SetIDList(LPCITEMIDLIST pidl) { - TRACE("(%p)->(pidl=%p)\n",this, pidl); - - if( pPidl ) - ILFree( pPidl ); - pPidl = ILClone( pidl ); - if( !pPidl ) + TRACE("(%p)->(pidl=%p)\n", this, pidl); + + if (pPidl) + ILFree(pPidl); + + pPidl = ILClone(pidl); + if (!pPidl) return E_FAIL; bDirty = TRUE; @@ -995,14 +973,15 @@ return S_OK; } -HRESULT WINAPI CShellLink::GetDescription(LPSTR pszName,INT cchMaxName) -{ - TRACE("(%p)->(%p len=%u)\n",this, pszName, cchMaxName); - - if( cchMaxName ) +HRESULT WINAPI CShellLink::GetDescription(LPSTR pszName, INT cchMaxName) +{ + TRACE("(%p)->(%p len=%u)\n", this, pszName, cchMaxName); + + if (cchMaxName) pszName[0] = 0; - if( sDescription ) - WideCharToMultiByte( CP_ACP, 0, sDescription, -1, + + if (sDescription) + WideCharToMultiByte(CP_ACP, 0, sDescription, -1, pszName, cchMaxName, NULL, NULL); return S_OK; @@ -1015,9 +994,10 @@ HeapFree(GetProcessHeap(), 0, sDescription); sDescription = NULL; - if ( pszName ) { - sDescription = HEAP_strdupAtoW( GetProcessHeap(), 0, pszName); - if ( !sDescription ) + if (pszName) + { + sDescription = HEAP_strdupAtoW(GetProcessHeap(), 0, pszName); + if (!sDescription) return E_OUTOFMEMORY; } bDirty = TRUE; @@ -1025,14 +1005,15 @@ return S_OK; } -HRESULT WINAPI CShellLink::GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath) +HRESULT WINAPI CShellLink::GetWorkingDirectory(LPSTR pszDir, INT cchMaxPath) { TRACE("(%p)->(%p len=%u)\n", this, pszDir, cchMaxPath); - if( cchMaxPath ) + if (cchMaxPath) pszDir[0] = 0; - if( sWorkDir ) - WideCharToMultiByte( CP_ACP, 0, sWorkDir, -1, + + if (sWorkDir) + WideCharToMultiByte(CP_ACP, 0, sWorkDir, -1, pszDir, cchMaxPath, NULL, NULL); return S_OK; @@ -1040,14 +1021,15 @@ HRESULT WINAPI CShellLink::SetWorkingDirectory(LPCSTR pszDir) { - TRACE("(%p)->(dir=%s)\n",this, pszDir); + TRACE("(%p)->(dir=%s)\n", this, pszDir); HeapFree(GetProcessHeap(), 0, sWorkDir); sWorkDir = NULL; - if ( pszDir ) { - sWorkDir = HEAP_strdupAtoW( GetProcessHeap(), 0, pszDir); - if ( !sWorkDir ) + if (pszDir) + { + sWorkDir = HEAP_strdupAtoW(GetProcessHeap(), 0, pszDir); + if (!sWorkDir) return E_OUTOFMEMORY; } bDirty = TRUE; @@ -1055,14 +1037,14 @@ return S_OK; } -HRESULT WINAPI CShellLink::GetArguments(LPSTR pszArgs,INT cchMaxPath) +HRESULT WINAPI CShellLink::GetArguments(LPSTR pszArgs, INT cchMaxPath) { TRACE("(%p)->(%p len=%u)\n", this, pszArgs, cchMaxPath); - if( cchMaxPath ) + if (cchMaxPath) pszArgs[0] = 0; - if( sArgs ) - WideCharToMultiByte( CP_ACP, 0, sArgs, -1, + if (sArgs) + WideCharToMultiByte(CP_ACP, 0, sArgs, -1, pszArgs, cchMaxPath, NULL, NULL); return S_OK; @@ -1070,14 +1052,15 @@ HRESULT WINAPI CShellLink::SetArguments(LPCSTR pszArgs) { - TRACE("(%p)->(args=%s)\n",this, pszArgs); + TRACE("(%p)->(args=%s)\n", this, pszArgs); HeapFree(GetProcessHeap(), 0, sArgs); sArgs = NULL; - if ( pszArgs ) { - sArgs = HEAP_strdupAtoW( GetProcessHeap(), 0, pszArgs); - if( !sArgs ) + if (pszArgs) + { + sArgs = HEAP_strdupAtoW(GetProcessHeap(), 0, pszArgs); + if (!sArgs) return E_OUTOFMEMORY; } @@ -1088,7 +1071,7 @@ HRESULT WINAPI CShellLink::GetHotkey(WORD *pwHotkey) { - TRACE("(%p)->(%p)(0x%08x)\n",this, pwHotkey, wHotKey); + TRACE("(%p)->(%p)(0x%08x)\n", this, pwHotkey, wHotKey); *pwHotkey = wHotKey; @@ -1097,7 +1080,7 @@ HRESULT WINAPI CShellLink::SetHotkey(WORD wHotkey) { - TRACE("(%p)->(hotkey=%x)\n",this, wHotkey); + TRACE("(%p)->(hotkey=%x)\n", this, wHotkey); wHotKey = wHotkey; bDirty = TRUE; @@ -1107,14 +1090,14 @@ HRESULT WINAPI CShellLink::GetShowCmd(INT *piShowCmd) { - TRACE("(%p)->(%p)\n",this, piShowCmd); + TRACE("(%p)->(%p)\n", this, piShowCmd); *piShowCmd = iShowCmd; return S_OK; } HRESULT WINAPI CShellLink::SetShowCmd(INT iShowCmd) { - TRACE("(%p) %d\n",this, iShowCmd); + TRACE("(%p) %d\n", this, iShowCmd); this->iShowCmd = iShowCmd; bDirty = TRUE; @@ -1123,20 +1106,20 @@ } static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, - LPSTR pszIconPath, int cchIconPath, int* piIcon) + LPSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf, &pidlLast); - if (SUCCEEDED(hr)) { - CComPtr<IExtractIconA> pei; + if (SUCCEEDED(hr)) + { + CComPtr<IExtractIconA> pei; hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL, (LPVOID*)&pei); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL); - } psf->Release(); } @@ -1144,7 +1127,7 @@ return hr; } -HRESULT WINAPI CShellLink::GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon) +HRESULT WINAPI CShellLink::GetIconLocation(LPSTR pszIconPath, INT cchIconPath, INT *piIcon) { TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon); @@ -1159,7 +1142,7 @@ if (pPidl || sPath) { - CComPtr<IShellFolder> pdsk; + CComPtr<IShellFolder> pdsk; HRESULT hr = SHGetDesktopFolder(&pdsk); @@ -1192,17 +1175,17 @@ return S_OK; } -HRESULT WINAPI CShellLink::SetIconLocation(LPCSTR pszIconPath,INT iIcon) -{ - TRACE("(%p)->(path=%s iicon=%u)\n",this, pszIconPath, iIcon); +HRESULT WINAPI CShellLink::SetIconLocation(LPCSTR pszIconPath, INT iIcon) +{ + TRACE("(%p)->(path=%s iicon=%u)\n", this, pszIconPath, iIcon); HeapFree(GetProcessHeap(), 0, sIcoPath); sIcoPath = NULL; - if ( pszIconPath ) + if (pszIconPath) { sIcoPath = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); - if ( !sIcoPath ) + if (!sIcoPath) return E_OUTOFMEMORY; } @@ -1214,12 +1197,12 @@ HRESULT WINAPI CShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved) { - TRACE("(%p)->(path=%s %x)\n",this, pszPathRel, dwReserved); + TRACE("(%p)->(path=%s %x)\n", this, pszPathRel, dwReserved); HeapFree(GetProcessHeap(), 0, sPathRel); sPathRel = NULL; - if ( pszPathRel ) + if (pszPathRel) { sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); bDirty = TRUE; @@ -1233,7 +1216,7 @@ HRESULT hr = S_OK; BOOL bSuccess; - TRACE("(%p)->(hwnd=%p flags=%x)\n",this, hwnd, fFlags); + TRACE("(%p)->(hwnd=%p flags=%x)\n", this, hwnd, fFlags); /*FIXME: use IResolveShellLink interface */ @@ -1245,8 +1228,8 @@ 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; @@ -1260,8 +1243,8 @@ 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; @@ -1276,24 +1259,21 @@ HRESULT WINAPI CShellLink::SetPath(LPCSTR pszFile) { - HRESULT r; - LPWSTR str; - - TRACE("(%p)->(path=%s)\n",this, pszFile); + TRACE("(%p)->(path=%s)\n", this, pszFile); if (pszFile == NULL) return E_INVALIDARG; - str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); + LPWSTR str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); if (!str) return E_OUTOFMEMORY; - r = SetPath(str); - HeapFree( GetProcessHeap(), 0, str ); - - return r; -} - -HRESULT WINAPI CShellLink::GetPath(LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags) + HRESULT hr = SetPath(str); + HeapFree(GetProcessHeap(), 0, str); + + return hr; +} + +HRESULT WINAPI CShellLink::GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags) { TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(sPath)); @@ -1305,110 +1285,111 @@ pszFile[0] = 0; if (sPath) - lstrcpynW( pszFile, sPath, cchMaxPath ); + lstrcpynW(pszFile, sPath, cchMaxPath); if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", this); return S_OK; } -HRESULT WINAPI CShellLink::GetDescription(LPWSTR pszName,INT cchMaxName) -{ - TRACE("(%p)->(%p len=%u)\n",this, pszName, cchMaxName); +HRESULT WINAPI CShellLink::GetDescription(LPWSTR pszName, INT cchMaxName) +{ + TRACE("(%p)->(%p len=%u)\n", this, pszName, cchMaxName); pszName[0] = 0; if (sDescription) - lstrcpynW( pszName, sDescription, cchMaxName ); + lstrcpynW(pszName, sDescription, cchMaxName); return S_OK; } HRESULT WINAPI CShellLink::SetDescription(LPCWSTR pszName) { - TRACE("(%p)->(desc=%s)\n",this, debugstr_w(pszName)); + TRACE("(%p)->(desc=%s)\n", this, debugstr_w(pszName)); HeapFree(GetProcessHeap(), 0, sDescription); - sDescription = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen( pszName )+1)*sizeof(WCHAR) ); - if ( !sDescription ) + sDescription = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszName) + 1) * sizeof(WCHAR)); + if (!sDescription) return E_OUTOFMEMORY; - wcscpy( sDescription, pszName ); + wcscpy(sDescription, pszName); bDirty = TRUE; return S_OK; } -HRESULT WINAPI CShellLink::GetWorkingDirectory(LPWSTR pszDir,INT cchMaxPath) +HRESULT WINAPI CShellLink::GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath) { TRACE("(%p)->(%p len %u)\n", this, pszDir, cchMaxPath); - if( cchMaxPath ) + if (cchMaxPath) pszDir[0] = 0; - if( sWorkDir ) - lstrcpynW( pszDir, sWorkDir, cchMaxPath ); + if (sWorkDir) + lstrcpynW(pszDir, sWorkDir, cchMaxPath); return S_OK; } HRESULT WINAPI CShellLink::SetWorkingDirectory(LPCWSTR pszDir) { - TRACE("(%p)->(dir=%s)\n",this, debugstr_w(pszDir)); + TRACE("(%p)->(dir=%s)\n", this, debugstr_w(pszDir)); HeapFree(GetProcessHeap(), 0, sWorkDir); - sWorkDir = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen( pszDir )+1)*sizeof (WCHAR) ); - if ( !sWorkDir ) + sWorkDir = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszDir) + 1) * sizeof (WCHAR)); + if (!sWorkDir) return E_OUTOFMEMORY; - wcscpy( sWorkDir, pszDir ); + wcscpy(sWorkDir, pszDir); bDirty = TRUE; return S_OK; } -HRESULT WINAPI CShellLink::GetArguments(LPWSTR pszArgs,INT cchMaxPath) +HRESULT WINAPI CShellLink::GetArguments(LPWSTR pszArgs, INT cchMaxPath) { TRACE("(%p)->(%p len=%u)\n", this, pszArgs, cchMaxPath); - if( cchMaxPath ) + if (cchMaxPath) pszArgs[0] = 0; - if( sArgs ) - lstrcpynW( pszArgs, sArgs, cchMaxPath ); + if (sArgs) + lstrcpynW(pszArgs, sArgs, cchMaxPath); return NOERROR; } HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs) { - TRACE("(%p)->(args=%s)\n",this, debugstr_w(pszArgs)); + TRACE("(%p)->(args=%s)\n", this, debugstr_w(pszArgs)); HeapFree(GetProcessHeap(), 0, sArgs); - sArgs = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen( pszArgs )+1)*sizeof (WCHAR) ); - if ( !sArgs ) + sArgs = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszArgs) + 1) * sizeof (WCHAR)); + if (!sArgs) return E_OUTOFMEMORY; - wcscpy( sArgs, pszArgs ); + + wcscpy(sArgs, pszArgs); bDirty = TRUE; return S_OK; } static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, - LPWSTR pszIconPath, int cchIconPath, int* piIcon) + LPWSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; UINT wFlags; HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf, &pidlLast); - if (SUCCEEDED(hr)) { - CComPtr<IExtractIconW> pei; + if (SUCCEEDED(hr)) + { + CComPtr<IExtractIconW> pei; hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL, (LPVOID*)&pei); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags); - } psf->Release(); } @@ -1416,7 +1397,7 @@ return hr; } -HRESULT WINAPI CShellLink::GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon) +HRESULT WINAPI CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cchIconPath, INT *piIcon) { TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon); @@ -1463,16 +1444,16 @@ return S_OK; } -HRESULT WINAPI CShellLink::SetIconLocation(LPCWSTR pszIconPath,INT iIcon) -{ - TRACE("(%p)->(path=%s iicon=%u)\n",this, debugstr_w(pszIconPath), iIcon); +HRESULT WINAPI CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT iIcon) +{ + TRACE("(%p)->(path=%s iicon=%u)\n", this, debugstr_w(pszIconPath), iIcon); HeapFree(GetProcessHeap(), 0, sIcoPath); - sIcoPath = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen( pszIconPath )+1)*sizeof (WCHAR) ); - if ( !sIcoPath ) + sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszIconPath) + 1) * sizeof (WCHAR)); + if (!sIcoPath) return E_OUTOFMEMORY; - wcscpy( sIcoPath, pszIconPath ); + wcscpy(sIcoPath, pszIconPath); iIcoNdx = iIcon; bDirty = TRUE; @@ -1482,14 +1463,14 @@ HRESULT WINAPI CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved) { - TRACE("(%p)->(path=%s %x)\n",this, debugstr_w(pszPathRel), dwReserved); + TRACE("(%p)->(path=%s %x)\n", this, debugstr_w(pszPathRel), dwReserved); HeapFree(GetProcessHeap(), 0, sPathRel); - sPathRel = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, - (wcslen( pszPathRel )+1) * sizeof (WCHAR) ); - if ( !sPathRel ) + sPathRel = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszPathRel) + 1) * sizeof (WCHAR)); + if (!sPathRel) return E_OUTOFMEMORY; - wcscpy( sPathRel, pszPathRel ); + wcscpy(sPathRel, pszPathRel); bDirty = TRUE; return ShellLink_UpdatePath(sPathRel, sPath, sWorkDir, &sPath); @@ -1497,80 +1478,75 @@ LPWSTR CShellLink::ShellLink_GetAdvertisedArg(LPCWSTR str) { - LPWSTR ret; - LPCWSTR p; - DWORD len; - - if( !str ) + if (!str) return NULL; - p = wcschr( str, ':' ); - if( !p ) + LPCWSTR p = wcschr(str, L':'); + if (!p) return NULL; - len = p - str; - ret = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); - if( !ret ) + DWORD len = p - str; + LPWSTR ret = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (len + 1)); + if (!ret) return ret; - memcpy( ret, str, sizeof(WCHAR)*len ); + memcpy(ret, str, sizeof(WCHAR)*len); ret[len] = 0; return ret; } HRESULT CShellLink::ShellLink_SetAdvertiseInfo(LPCWSTR str) { - LPCWSTR szComponent = NULL, szProduct = NULL, p; - WCHAR szGuid[39]; - HRESULT r; - GUID guid; - int len; - - while( str[0] ) + LPCWSTR szComponent = NULL, szProduct = NULL; + + while (str[0]) { /* each segment must start with two colons */ - if( str[0] != ':' || str[1] != ':' ) + if (str[0] != ':' || str[1] != ':') return E_FAIL; /* the last segment is just two colons */ - if( !str[2] ) + if (!str[2]) break; str += 2; /* there must be a colon straight after a guid */ - p = wcschr( str, ':' ); - if( !p ) + LPCWSTR p = wcschr(str, L':'); + if (!p) return E_FAIL; - len = p - str; - if( len != 38 ) + INT len = p - str; + if (len != 38) return E_FAIL; /* get the guid, and check it's validly formatted */ - memcpy( szGuid, str, sizeof(WCHAR)*len ); + WCHAR szGuid[39]; + memcpy(szGuid, str, sizeof(WCHAR)*len); szGuid[len] = 0; - r = CLSIDFromString( szGuid, &guid ); - if( r != S_OK ) - return r; + + GUID guid; + HRESULT hr = CLSIDFromString(szGuid, &guid); + if (hr != S_OK) + return hr; str = p + 1; /* match it up to a guid that we care about */ - if( IsEqualGUID( guid, SHELL32_AdvtShortcutComponent ) && !szComponent ) + if (IsEqualGUID(guid, SHELL32_AdvtShortcutComponent) && !szComponent) szComponent = str; - else if( IsEqualGUID(guid, SHELL32_AdvtShortcutProduct ) && !szProduct ) + else if (IsEqualGUID(guid, SHELL32_AdvtShortcutProduct) && !szProduct) szProduct = str; else return E_FAIL; /* skip to the next field */ - str = wcschr( str, ':' ); - if( !str ) + str = wcschr(str, L':'); + if (!str) return E_FAIL; } /* we have to have a component for an advertised shortcut */ - if( !szComponent ) + if (!szComponent) return E_FAIL; - sComponent = ShellLink_GetAdvertisedArg( szComponent ); - sProduct = ShellLink_GetAdvertisedArg( szProduct ); + sComponent = ShellLink_GetAdvertisedArg(szComponent); + sProduct = ShellLink_GetAdvertisedArg(szProduct); TRACE("Component = %s\n", debugstr_w(sComponent)); TRACE("Product = %s\n", debugstr_w(sProduct)); @@ -1580,30 +1556,27 @@ static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, CShellLink::volume_info *volume) { - const int label_sz = sizeof volume->label/sizeof volume->label[0]; WCHAR drive[4] = { path[0], ':', '\\', 0 }; - BOOL r; volume->type = GetDriveTypeW(drive); - r = GetVolumeInformationW(drive, volume->label, label_sz, &volume->serial, NULL, NULL, NULL, 0); - TRACE("r = %d type %d serial %08x name %s\n", r, + BOOL bRet = GetVolumeInformationW(drive, volume->label, _countof(volume->label), &volume->serial, NULL, NULL, NULL, 0); + TRACE("ret = %d type %d serial %08x name %s\n", bRet, volume->type, volume->serial, debugstr_w(volume->label)); - return r; + return bRet; } HRESULT WINAPI CShellLink::SetPath(LPCWSTR pszFile) { - WCHAR buffer[MAX_PATH]; - LPWSTR fname, unquoted = NULL; + LPWSTR unquoted = NULL; HRESULT hr = S_OK; - UINT len; - - TRACE("(%p)->(path=%s)\n",this, debugstr_w(pszFile)); - - if (!pszFile) return E_INVALIDARG; + + TRACE("(%p)->(path=%s)\n", this, debugstr_w(pszFile)); + + if (!pszFile) + return E_INVALIDARG; /* quotes at the ends of the string are stripped */ - len = wcslen(pszFile); + UINT len = wcslen(pszFile); if (pszFile[0] == '"' && pszFile[len-1] == '"') { unquoted = strdupW(pszFile); @@ -1628,52 +1601,56 @@ ILFree(pPidl); pPidl = NULL; - if (S_OK != ShellLink_SetAdvertiseInfo(pszFile )) - { + if (S_OK != ShellLink_SetAdvertiseInfo(pszFile)) + { + WCHAR buffer[MAX_PATH]; + LPWSTR fname; + if (*pszFile == '\0') *buffer = '\0'; else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname)) return E_FAIL; else if(!PathFileExistsW(buffer) && - !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) + !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) hr = S_FALSE; pPidl = SHSimpleIDListFromPathW(pszFile); ShellLink_GetVolumeInfo(buffer, &volume); - 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; HeapFree(GetProcessHeap(), 0, unquoted); return hr; } -HRESULT WINAPI CShellLink::AddDataBlock(void* pDataBlock ) +HRESULT WINAPI CShellLink::AddDataBlock(void* pDataBlock) { FIXME("\n"); return E_NOTIMPL; } -HRESULT WINAPI CShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock ) +HRESULT WINAPI CShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock) { LPVOID block = NULL; - HRESULT r = E_FAIL; - - TRACE("%p %08x %p\n", this, dwSig, ppDataBlock ); + HRESULT hr = E_FAIL; + + TRACE("%p %08x %p\n", this, dwSig, ppDataBlock); switch (dwSig) { case EXP_DARWIN_ID_SIG: if (!sComponent) break; - block = shelllink_build_darwinid( sComponent, dwSig ); - r = S_OK; + block = shelllink_build_darwinid(sComponent, dwSig); + hr = S_OK; break; case EXP_SZ_LINK_SIG: case NT_CONSOLE_PROPS_SIG: @@ -1686,20 +1663,20 @@ ERR("unknown datablock %08x\n", dwSig); } *ppDataBlock = block; - return r; -} - -HRESULT WINAPI CShellLink::RemoveDataBlock(DWORD dwSig ) + return hr; +} + +HRESULT WINAPI CShellLink::RemoveDataBlock(DWORD dwSig) { FIXME("\n"); return E_NOTIMPL; } -HRESULT WINAPI CShellLink::GetFlags(DWORD* pdwFlags ) +HRESULT WINAPI CShellLink::GetFlags(DWORD *pdwFlags) { DWORD flags = 0; - FIXME("%p %p\n", this, pdwFlags ); + FIXME("%p %p\n", this, pdwFlags); /* FIXME: add more */ if (sArgs) @@ -1720,7 +1697,7 @@ return S_OK; } -HRESULT WINAPI CShellLink::SetFlags(DWORD dwFlags ) +HRESULT WINAPI CShellLink::SetFlags(DWORD dwFlags) { FIXME("\n"); return E_NOTIMPL; @@ -1731,63 +1708,59 @@ * * Loads the shelllink from the dataobject the shell is pointing to. */ -HRESULT WINAPI CShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID ) -{ +HRESULT WINAPI CShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) +{ + TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID); + + if (!pdtobj) + return E_FAIL; + FORMATETC format; - STGMEDIUM stgm; - UINT count; - HRESULT r = E_FAIL; - - TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID ); - - if( !pdtobj ) - return r; - format.cfFormat = CF_HDROP; format.ptd = NULL; format.dwAspect = DVASPECT_CONTENT; format.lindex = -1; format.tymed = TYMED_HGLOBAL; - if( FAILED(pdtobj->GetData(&format, &stgm ) ) ) - return r; - - count = DragQueryFileW((HDROP)stgm.hGlobal, -1, NULL, 0 ); - if( count == 1 ) - { - LPWSTR path; - - count = DragQueryFileW((HDROP)stgm.hGlobal, 0, NULL, 0 ); + STGMEDIUM stgm; + HRESULT hr = pdtobj->GetData(&format, &stgm); + if (FAILED(hr)) + return hr; + + UINT count = DragQueryFileW((HDROP)stgm.hGlobal, -1, NULL, 0); + if (count == 1) + { + count = DragQueryFileW((HDROP)stgm.hGlobal, 0, NULL, 0); count++; - path = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, count*sizeof(WCHAR) ); - if( path ) + LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)); + if (path) { - count = DragQueryFileW((HDROP)stgm.hGlobal, 0, path, count ); - r = Load(path, 0 ); - HeapFree(GetProcessHeap(), 0, path ); + count = DragQueryFileW((HDROP)stgm.hGlobal, 0, path, count); + hr = Load(path, 0); + HeapFree(GetProcessHeap(), 0, path); } } - ReleaseStgMedium(&stgm ); - - return r; + ReleaseStgMedium(&stgm); + + return S_OK; } HRESULT WINAPI CShellLink::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - WCHAR wszOpen[20]; - MENUITEMINFOW mii; int id = 1; TRACE("%p %p %u %u %u %u\n", this, - hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); + hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (!hMenu) return E_INVALIDARG; - if (!LoadStringW(shell32_hInstance, IDS_OPEN_VERB, wszOpen, sizeof(wszOpen)/sizeof(WCHAR))) + WCHAR wszOpen[20]; + if (!LoadStringW(shell32_hInstance, IDS_OPEN_VERB, wszOpen, _countof(wszOpen))) wszOpen[0] = L'\0'; - memset( &mii, 0, sizeof(mii) ); + MENUITEMINFOW mii; + memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof (mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; mii.dwTypeData = wszOpen; @@ -1803,79 +1776,73 @@ } static LPWSTR -shelllink_get_msi_component_path( LPWSTR component ) -{ - LPWSTR path; - DWORD r, sz = 0; - - r = CommandLineFromMsiDescriptor( component, NULL, &sz ); - if (r != ERROR_SUCCESS) - return NULL; +shelllink_get_msi_component_path(LPWSTR component) +{ + DWORD Result, sz = 0; + + Result = CommandLineFromMsiDescriptor(component, NULL, &sz); + if (Result != ERROR_SUCCESS) + return NULL; sz++; - path = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - r = CommandLineFromMsiDescriptor( component, path, &sz ); - if (r != ERROR_SUCCESS) - { - HeapFree( GetProcessHeap(), 0, path ); + LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)); + Result = CommandLineFromMsiDescriptor(component, path, &sz); + if (Result != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, path); path = NULL; } - TRACE("returning %s\n", debugstr_w( path ) ); + TRACE("returning %s\n", debugstr_w(path)); return path; } HRESULT WINAPI CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - static const WCHAR szOpen[] = { 'o','p','e','n',0 }; - static const WCHAR szCplOpen[] = { 'c','p','l','o','p','e','n',0 }; - SHELLEXECUTEINFOW sei; HWND hwnd = NULL; /* FIXME: get using interface set from IObjectWithSite */ LPWSTR args = NULL; LPWSTR path = NULL; - HRESULT r; - - TRACE("%p %p\n", this, lpici ); - - if ( lpici->cbSize < sizeof (CMINVOKECOMMANDINFO) ) + + TRACE("%p %p\n", this, lpici); + + if (lpici->cbSize < sizeof (CMINVOKECOMMANDINFO)) return E_INVALIDARG; - r = Resolve(hwnd, 0 ); - if ( FAILED( r ) ) - { - TRACE("failed to resolve component with error 0x%08x", r); - return r; - } - if ( sComponent ) - { - path = shelllink_get_msi_component_path( sComponent ); + HRESULT hr = Resolve(hwnd, 0); + if (FAILED(hr)) + { + TRACE("failed to resolve component with error 0x%08x", hr); + return hr; + } + if (sComponent) + { + path = shelllink_get_msi_component_path(sComponent); if (!path) return E_FAIL; } else - path = strdupW( sPath ); - - if ( lpici->cbSize == sizeof (CMINVOKECOMMANDINFOEX) && - ( lpici->fMask & CMIC_MASK_UNICODE ) ) + path = strdupW(sPath); + + if (lpici->cbSize == sizeof (CMINVOKECOMMANDINFOEX) && + (lpici->fMask & CMIC_MASK_UNICODE)) { LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici; DWORD len = 2; - if ( sArgs ) - len += wcslen( sArgs ); - if ( iciex->lpParametersW ) - len += wcslen( iciex->lpParametersW ); - - args = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (sArgs) + len += wcslen(sArgs); + if (iciex->lpParametersW) + len += wcslen(iciex->lpParametersW); + + args = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); args[0] = 0; - if ( sArgs ) - wcscat( args, sArgs ); - if ( iciex->lpParametersW ) + if (sArgs) + wcscat(args, sArgs); + if (iciex->lpParametersW) { - static const WCHAR space[] = { ' ', 0 }; - wcscat( args, space ); - wcscat( args, iciex->lpParametersW ); + wcscat(args, L" "); + wcscat(args, iciex->lpParametersW); } } else if (sArgs != NULL) @@ -1883,35 +1850,34 @@ args = strdupW(sArgs); } - memset( &sei, 0, sizeof sei ); + SHELLEXECUTEINFOW sei; + memset(&sei, 0, sizeof sei); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); + sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; sei.nShow = iShowCmd; sei.lpDirectory = sWorkDir; sei.lpParameters = args; - sei.lpVerb = szOpen; + sei.lpVerb = L"open"; // HACK for ShellExecuteExW - if (!wcsstr(sPath, L".cpl")) - sei.lpVerb = szOpen; + if (wcsstr(sPath, L".cpl")) + sei.lpVerb = L"cplopen"; + + if (ShellExecuteExW(&sei)) + hr = S_OK; else - sei.lpVerb = szCplOpen; - - if( ShellExecuteExW( &sei ) ) - r = S_OK; - else - r = E_FAIL; - - HeapFree( GetProcessHeap(), 0, args ); - HeapFree( GetProcessHeap(), 0, path ); - - return r; + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, args); + HeapFree(GetProcessHeap(), 0, path); + + return hr; } HRESULT WINAPI CShellLink::GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax) { - FIXME("%p %lu %u %p %p %u\n", this, idCmd, uType, pwReserved, pszName, cchMax ); + FIXME("%p %lu %u %p %p %u\n", this, idCmd, uType, pwReserved, pszName, cchMax); return E_NOTIMPL; } @@ -1919,22 +1885,21 @@ 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); + HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); } return TRUE; case WM_COMMAND: - hDlgCtrl = GetDlgItem(hwndDlg, 14000); + { + HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); if (LOWORD(wParam) == IDOK) { - if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED ) + if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) EndDialog(hwndDlg, 1); else EndDialog(hwndDlg, 0); @@ -1945,11 +1910,12 @@ } else if (LOWORD(wParam) == 14000) { - if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) + 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; } @@ -1972,13 +1938,27 @@ if (ppsp == NULL) break; - TRACE("ShellLink_DlgProc (WM_INITDIALOG hwnd %p lParam %p ppsplParam %x)\n",hwndDlg, lParam, ppsp->lParam); + TRACE("ShellLink_DlgProc (WM_INITDIALOG hwnd %p lParam %p ppsplParam %x)\n", hwndDlg, lParam, ppsp->lParam); pThis = (CShellLink *)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); + pThis->sIcoPath, pThis->sPath, pThis->sPathRel, pThis->sProduct, pThis->sWorkDir); + + /* Get file information */ + SHFILEINFO fi; + if (!SHGetFileInfoW(pThis->sLinkPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME|SHGFI_ICON)) + { + ERR("SHGetFileInfoW failed for %ls (%lu)\n", pThis->sLinkPath, GetLastError()); + fi.szTypeName[0] = L'\0'; + fi.hIcon = NULL; + } + + if (fi.hIcon) // TODO: destroy icon + SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)fi.hIcon, 0); + else + ERR("ExtractIconW failed %ls %u\n", pThis->sIcoPath, pThis->iIcoNdx); /* target location */ if (pThis->sWorkDir) @@ -2060,7 +2040,7 @@ } return TRUE; } - + case 14022: { INT_PTR result = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(SHELL_EXTENDED_SHORTCUT_DLG), hwndDlg, ExtendedShortcutProc, (LPARAM)pThis->bRunAs); @@ -2076,12 +2056,8 @@ return TRUE; } } - switch(HIWORD(wParam)) - { - case EN_CHANGE: + if(HIWORD(wParam) == EN_CHANGE) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } break; default: break; @@ -2095,21 +2071,17 @@ HRESULT WINAPI CShellLink::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) { - HPROPSHEETPAGE hPage; - BOOL bRet; - - hPage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)this, NULL); + HPROPSHEETPAGE hPage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)this, NULL); if (hPage == NULL) { - ERR("failed to create property sheet page\n"); - return E_FAIL; - } - - bRet = pfnAddPage(hPage, lParam); - if (bRet) - return S_OK; - else - return E_FAIL; + ERR("failed to create property sheet page\n"); + return E_FAIL; + } + + if (!pfnAddPage(hPage, lParam)) + return E_FAIL; + + return S_OK; } HRESULT WINAPI CShellLink::ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam) @@ -2129,11 +2101,12 @@ HRESULT WINAPI CShellLink::GetSite(REFIID iid, void ** ppvSite) { - TRACE("%p %s %p\n", this, debugstr_guid(&iid), ppvSite ); + TRACE("%p %s %p\n", this, debugstr_guid(&iid), ppvSite); if (site == NULL) return E_FAIL; - return site->QueryInterface(iid, ppvSite ); + + return site->QueryInterface(iid, ppvSite); } /************************************************************************** @@ -2141,13 +2114,13 @@ */ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown *pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID *ppv) { - CComPtr<IUnknown> psl; + CComPtr<IUnknown> psl; HRESULT hr = CShellLink::_CreatorClass::CreateInstance(NULL, riid, (void**)&psl); if (SUCCEEDED(hr)) { - CComPtr<IPersistFile> ppf; + CComPtr<IPersistFile> ppf; *ppv = NULL;

1 0

[ion] 54990: Fix boot. The fact this fixes it should worry about the state of CSRSS...
by ion＠svn.reactos.org 17 Jan '12

17 Jan '12

Author: ion Date: Tue Jan 17 17:42:47 2012 New Revision: 54990 URL: http://svn.reactos.org/svn/reactos?rev=54990&view=rev Log: Fix boot. The fact this fixes it should worry about the state of CSRSS... Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Jan 17 17:42:47 2012 @@ -801,7 +801,6 @@ SIZE_T Size; BOOLEAN HavePebLock = FALSE, Result; PPEB Peb = NtCurrentPeb(); - DPRINT("BasePushProcessParameters\n"); /* Get the full path name */ Size = GetFullPathNameW(ApplicationPathName, @@ -1050,7 +1049,7 @@ RTL_USER_PROCESS_PARAMETERS_PROFILE_KERNEL : 0; ProcessParameters->Flags |= (CreationFlags & PROFILE_SERVER) ? RTL_USER_PROCESS_PARAMETERS_PROFILE_SERVER : 0; - ProcessParameters->Flags |= (NtCurrentPeb()->ProcessParameters->Flags & + ProcessParameters->Flags |= (Peb->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_DISABLE_HEAP_CHECKS); /* Write the Parameter Block */ @@ -1068,7 +1067,7 @@ sizeof(PVOID), NULL); if (!NT_SUCCESS(Status)) goto FailPath; - + /* Check if there's any app compat data to write */ RemoteAppCompatData = NULL; if (AppCompatData) @@ -1082,7 +1081,7 @@ MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) goto FailPath; - + /* Write the application compatibility data */ Status = NtWriteVirtualMemory(ProcessHandle, RemoteAppCompatData, @@ -1091,7 +1090,7 @@ NULL); if (!NT_SUCCESS(Status)) goto FailPath; } - + /* Write the PEB Pointer to the app compat data (might be NULL) */ Status = NtWriteVirtualMemory(ProcessHandle, &RemotePeb->pShimData, @@ -1109,7 +1108,7 @@ sizeof(ImageSubsystem), NULL); } - + /* Success path */ Result = TRUE; Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Tue Jan 17 17:42:47 2012 @@ -51,6 +51,7 @@ typedef struct { +#if 0 // // NT-type structure (BASE_CREATEPROCESS_MSG) // @@ -65,6 +66,7 @@ PVOID PebAddressNative; ULONG PebAddressWow64; USHORT ProcessorArchitecture; +#endif // // ReactOS Data //

1 0

[rharabien] 54989: [SHELL32] - Remove useless function
by rharabien＠svn.reactos.org 17 Jan '12

17 Jan '12

Author: rharabien Date: Tue Jan 17 16:49:39 2012 New Revision: 54989 URL: http://svn.reactos.org/svn/reactos?rev=54989&view=rev Log: [SHELL32] - Remove useless function Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Tue Jan 17 16:49:39 2012 @@ -201,42 +201,6 @@ return r; } -static BOOL StartLinkProcessor( LPCOLESTR szLink ) -{ - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','"','%','s','"',0 }; - LONG len; - LPWSTR buffer; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - BOOL ret; - - len = sizeof(szFormat) + wcslen( szLink ) * sizeof(WCHAR); - buffer = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, len ); - if( !buffer ) - return FALSE; - - swprintf( buffer, szFormat, szLink ); - - TRACE("starting %s\n",debugstr_w(buffer)); - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - - HeapFree( GetProcessHeap(), 0, buffer ); - - if (ret) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - - return ret; -} - HRESULT WINAPI CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember) { HRESULT r; @@ -263,8 +227,6 @@ { wcscpy(sLinkPath, pszFileName); } - - StartLinkProcessor( pszFileName ); bDirty = FALSE; }

1 0

[cgutman] 54988: [NTOSKRNL] - Deallocate the process page directory when destroying its address space (removed in r48233 and now resurrected in a version compatible with ARM3) - Fixes leaking syste...
by cgutman＠svn.reactos.org 17 Jan '12

17 Jan '12

Author: cgutman Date: Tue Jan 17 07:03:46 2012 New Revision: 54988 URL: http://svn.reactos.org/svn/reactos?rev=54988&view=rev Log: [NTOSKRNL] - Deallocate the process page directory when destroying its address space (removed in r48233 and now resurrected in a version compatible with ARM3) - Fixes leaking system pages on each process exit (868 MC_SYSTEM pages were allocated just sitting at the desktop on livecd without the patch, only 187 with the patch) Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Jan 17 07:03:46 2012 @@ -1503,9 +1503,9 @@ NTAPI MmReleaseMmInfo(struct _EPROCESS *Process); -NTSTATUS -NTAPI -Mmi386ReleaseMmInfo(struct _EPROCESS *Process); +VOID +NTAPI +MmDeleteProcessPageDirectory(struct _EPROCESS *Process); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Jan 17 07:03:46 2012 @@ -200,6 +200,64 @@ return(Attributes); } +static +VOID +MmDeletePageDirectoryEntry(ULONG PdeEntry) +{ + KIRQL OldIrql; + PMMPFN Page; + + Page = MiGetPfnEntry(PTE_TO_PFN(PdeEntry)); + + /* Check if this is a legacy allocation */ + if (MI_IS_ROS_PFN(Page)) + { + /* Free it using the legacy API */ + MmReleasePageMemoryConsumer(MC_SYSTEM, PTE_TO_PFN(PdeEntry)); + } + else + { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Free it using the ARM3 API */ + MI_SET_PFN_DELETED(Page); + MiDecrementShareCount(Page, PTE_TO_PFN(PdeEntry)); + + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } +} + +VOID +NTAPI +MmDeleteProcessPageDirectory(PEPROCESS Process) +{ + PULONG PageDir; + ULONG PdeOffset; + + /* Map the page directory in hyperspace */ + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + + /* Loop the user land page directory */ + for (PdeOffset = 0; PdeOffset < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); PdeOffset++) + { + /* Check if a valid PDE exists here */ + if (PageDir[PdeOffset] != 0) + { + /* Free the page that backs it */ + MmDeletePageDirectoryEntry(PageDir[PdeOffset]); + } + } + + /* Free the hyperspace mapping page (ARM3) */ + MmDeletePageDirectoryEntry(PageDir[ADDR_TO_PDE_OFFSET(HYPERSPACE)]); + + /* Delete the hyperspace mapping */ + MmDeleteHyperspaceMapping(PageDir); + + /* Free the PDE page itself (ARM3) */ + MmDeletePageDirectoryEntry(Process->Pcb.DirectoryTableBase[0]); +} + static PULONG MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) { Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Jan 17 07:03:46 2012 @@ -1057,6 +1057,8 @@ } } + MmDeleteProcessPageDirectory(Process); + MmUnlockAddressSpace(&Process->Vm); DPRINT("Finished MmReleaseMmInfo()\n");

1 0

[ekohl] 54987: [EVENTLOG] - LogfCreate: Use NtCreateFile instead of CreateFile - Implement ElfCreateBackupLogHandle
by ekohl＠svn.reactos.org 16 Jan '12

16 Jan '12

Author: ekohl Date: Mon Jan 16 23:23:29 2012 New Revision: 54987 URL: http://svn.reactos.org/svn/reactos?rev=54987&view=rev Log: [EVENTLOG] - LogfCreate: Use NtCreateFile instead of CreateFile - Implement ElfCreateBackupLogHandle Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Mon Jan 16 23:23:29 2012 @@ -267,7 +267,9 @@ DWORD MaxValueLen, ValueLen, Type, ExpandedLen; WCHAR *Buf = NULL, *Expanded = NULL; LONG Result; - PLOGFILE pLogf; + PLOGFILE pLogf = NULL; + UNICODE_STRING FileName; + NTSTATUS Status; DPRINT("LoadLogFile: %S\n", LogName); @@ -314,13 +316,21 @@ ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); + if (!RtlDosPathNameToNtPathName_U(Expanded, &FileName, + NULL, NULL)) + { + DPRINT1("Can't convert path!\n"); + HeapFree(MyHeap, 0, Expanded); + HeapFree(MyHeap, 0, Buf); + return NULL; + } + DPRINT("%S -> %S\n", Buf, Expanded); - pLogf = LogfCreate(LogName, Expanded); - - if (pLogf == NULL) - { - DPRINT1("Failed to create %S!\n", Expanded); + Status = LogfCreate(&pLogf, LogName, &FileName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status); } HeapFree(MyHeap, 0, Buf); Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Jan 16 23:23:29 2012 @@ -102,12 +102,17 @@ WCHAR szName[1]; } EVENTSOURCE, *PEVENTSOURCE; + +/* Log Handle Flags */ +#define LOG_HANDLE_BACKUP_FILE 1 + typedef struct _LOGHANDLE { LIST_ENTRY LogHandleListEntry; PEVENTSOURCE EventSource; PLOGFILE LogFile; ULONG CurrentRecord; + ULONG Flags; WCHAR szName[1]; } LOGHANDLE, *PLOGHANDLE; @@ -149,8 +154,10 @@ LogfBackupFile(PLOGFILE LogFile, PUNICODE_STRING BackupFileName); -PLOGFILE LogfCreate(WCHAR * LogName, - WCHAR * FileName); +NTSTATUS +LogfCreate(PLOGFILE *Logfile, + WCHAR * LogName, + PUNICODE_STRING FileName); VOID LogfClose(PLOGFILE LogFile); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Jan 16 23:23:29 2012 @@ -288,104 +288,127 @@ return TRUE; } -PLOGFILE LogfCreate(WCHAR * LogName, WCHAR * FileName) -{ - PLOGFILE LogFile; + +NTSTATUS +LogfCreate(PLOGFILE *LogFile, + WCHAR * LogName, + PUNICODE_STRING FileName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PLOGFILE pLogFile; BOOL bResult, bCreateNew = FALSE; - - LogFile = (LOGFILE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(LOGFILE)); - if (!LogFile) + NTSTATUS Status = STATUS_SUCCESS; + + pLogFile = (LOGFILE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(LOGFILE)); + if (!pLogFile) { DPRINT1("Can't allocate heap!\n"); - return NULL; - } - - LogFile->hFile = CreateFile(FileName, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ, - NULL, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, - NULL); - - if (LogFile->hFile == INVALID_HANDLE_VALUE) - { - DPRINT1("Can't create file %S.\n", FileName); - HeapFree(MyHeap, 0, LogFile); - return NULL; - } - - bCreateNew = (GetLastError() == ERROR_ALREADY_EXISTS) ? FALSE : TRUE; - - LogFile->LogName = + return STATUS_NO_MEMORY; + } + + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&pLogFile->hFile, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, + FILE_OPEN_IF, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't create file %wZ (Status: 0x%08lx)\n", FileName, Status); + goto fail; + } + + bCreateNew = (IoStatusBlock.Information == FILE_CREATED) ? TRUE: FALSE; + + pLogFile->LogName = (WCHAR *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, (lstrlenW(LogName) + 1) * sizeof(WCHAR)); - - if (LogFile->LogName) - lstrcpyW(LogFile->LogName, LogName); - else + if (pLogFile->LogName == NULL) { DPRINT1("Can't allocate heap\n"); - HeapFree(MyHeap, 0, LogFile); - return NULL; - } - - LogFile->FileName = + Status = STATUS_NO_MEMORY; + goto fail; + } + + lstrcpyW(pLogFile->LogName, LogName); + + pLogFile->FileName = (WCHAR *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, - (lstrlenW(FileName) + 1) * sizeof(WCHAR)); - - if (LogFile->FileName) - lstrcpyW(LogFile->FileName, FileName); - else + (lstrlenW(FileName->Buffer) + 1) * sizeof(WCHAR)); + if (pLogFile->FileName == NULL) { DPRINT1("Can't allocate heap\n"); + Status = STATUS_NO_MEMORY; goto fail; } - LogFile->OffsetInfo = + lstrcpyW(pLogFile->FileName, FileName->Buffer); + + pLogFile->OffsetInfo = (PEVENT_OFFSET_INFO) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(EVENT_OFFSET_INFO) * 64); - - if (!LogFile->OffsetInfo) + if (pLogFile->OffsetInfo == NULL) { DPRINT1("Can't allocate heap\n"); + Status = STATUS_NO_MEMORY; goto fail; } - LogFile->OffsetInfoSize = 64; + pLogFile->OffsetInfoSize = 64; if (bCreateNew) - bResult = LogfInitializeNew(LogFile); + bResult = LogfInitializeNew(pLogFile); else - bResult = LogfInitializeExisting(LogFile); + bResult = LogfInitializeExisting(pLogFile); if (!bResult) + { + Status = STATUS_UNSUCCESSFUL; goto fail; - - RtlInitializeResource(&LogFile->Lock); - - LogfListAddItem(LogFile); - return LogFile; + } + + RtlInitializeResource(&pLogFile->Lock); + + LogfListAddItem(pLogFile); fail: - if (LogFile) - { - if (LogFile->OffsetInfo) - HeapFree(MyHeap, 0, LogFile->OffsetInfo); - - if (LogFile->FileName) - HeapFree(MyHeap, 0, LogFile->FileName); - - if (LogFile->LogName) - HeapFree(MyHeap, 0, LogFile->LogName); - - HeapFree(MyHeap, 0, LogFile); - } - - return NULL; + if (!NT_SUCCESS(Status)) + { + if ((pLogFile->hFile != NULL) && (pLogFile->hFile != INVALID_HANDLE_VALUE)) + CloseHandle(pLogFile->hFile); + + if (pLogFile->OffsetInfo) + HeapFree(MyHeap, 0, pLogFile->OffsetInfo); + + if (pLogFile->FileName) + HeapFree(MyHeap, 0, pLogFile->FileName); + + if (pLogFile->LogName) + HeapFree(MyHeap, 0, pLogFile->LogName); + + HeapFree(MyHeap, 0, pLogFile); + } + else + { + *LogFile = pLogFile; + } + + return Status; } VOID LogfClose(PLOGFILE LogFile) Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Mon Jan 16 23:23:29 2012 @@ -142,8 +142,48 @@ ElfCreateBackupLogHandle(PLOGHANDLE *LogHandle, PUNICODE_STRING FileName) { + PLOGHANDLE lpLogHandle; + + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("ElfCreateBackupLogHandle(FileName: %wZ)\n", FileName); - return STATUS_NOT_IMPLEMENTED; + + lpLogHandle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGHANDLE)); + if (lpLogHandle == NULL) + { + DPRINT1("Failed to allocate Heap!\n"); + return STATUS_NO_MEMORY; + } + + /* Create the log file */ + Status = LogfCreate(&lpLogHandle->LogFile, + NULL, + FileName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the log file! (Status 0x%08lx)\n", Status); + goto Done; + } + + /* Set the backup flag */ + lpLogHandle->Flags |= LOG_HANDLE_BACKUP_FILE; + + /* Get the current record */ + lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile); + +Done: + if (NT_SUCCESS(Status)) + { + /* Append log handle */ + InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry); + *LogHandle = lpLogHandle; + } + else + { + HeapFree(GetProcessHeap(), 0, lpLogHandle); + } + + return Status; } @@ -169,6 +209,10 @@ if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) return STATUS_INVALID_HANDLE; + + /* Close the log file if it is a backup file */ + if (lpLogHandle->Flags & LOG_HANDLE_BACKUP_FILE) + LogfClose(lpLogHandle->LogFile); RemoveEntryList(&lpLogHandle->LogHandleListEntry); HeapFree(GetProcessHeap(),0,lpLogHandle);

1 0

[ion] 54986: [KERNEL32]: Reimplement BasePushProcessParameters for future extensibility, also cleanup some code paths and fix a few bugs. [KERNEL32]: Add some more SXS and CSRSS structures.
by ion＠svn.reactos.org 16 Jan '12

16 Jan '12

Author: ion Date: Mon Jan 16 21:27:50 2012 New Revision: 54986 URL: http://svn.reactos.org/svn/reactos?rev=54986&view=rev Log: [KERNEL32]: Reimplement BasePushProcessParameters for future extensibility, also cleanup some code paths and fix a few bugs. [KERNEL32]: Add some more SXS and CSRSS structures. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Jan 16 21:27:50 2012 @@ -774,57 +774,33 @@ } } -VOID -WINAPI -BasepCopyHandles(IN PRTL_USER_PROCESS_PARAMETERS Params, - IN PRTL_USER_PROCESS_PARAMETERS PebParams, - IN BOOL InheritHandles) -{ - DPRINT("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); - - /* Copy the handle if we are inheriting or if it's a console handle */ - if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardInput))) - { - Params->StandardInput = PebParams->StandardInput; - } - - if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardOutput))) - { - Params->StandardOutput = PebParams->StandardOutput; - } - - if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardError))) - { - Params->StandardError = PebParams->StandardError; - } -} - -NTSTATUS -WINAPI -BasePushProcessParameters(IN HANDLE ProcessHandle, - IN PPEB Peb, - IN LPWSTR ApplicationPathName, +BOOLEAN +WINAPI +BasePushProcessParameters(IN ULONG ParameterFlags, + IN HANDLE ProcessHandle, + IN PPEB RemotePeb, + IN LPCWSTR ApplicationPathName, IN LPWSTR lpCurrentDirectory, IN LPWSTR lpCommandLine, IN LPVOID lpEnvironment, - IN SIZE_T EnvSize, IN LPSTARTUPINFOW StartupInfo, IN DWORD CreationFlags, - IN BOOL InheritHandles) + IN BOOL InheritHandles, + IN ULONG ImageSubsystem, + IN PVOID AppCompatData, + IN ULONG AppCompatDataSize) { WCHAR FullPath[MAX_PATH + 5]; - LPWSTR Remaining; - LPWSTR DllPathString; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; - PRTL_USER_PROCESS_PARAMETERS RemoteParameters = NULL; + PWCHAR Remaining, DllPathString, ScanChar; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters, RemoteParameters; + PVOID RemoteAppCompatData; UNICODE_STRING DllPath, ImageName, CommandLine, CurrentDirectory; + UNICODE_STRING Desktop, Shell, Runtime, Title; NTSTATUS Status; - PWCHAR ScanChar; ULONG EnviroSize; SIZE_T Size; - UNICODE_STRING Desktop, Shell, Runtime, Title; - PPEB OurPeb = NtCurrentPeb(); - LPVOID Environment = lpEnvironment; + BOOLEAN HavePebLock = FALSE, Result; + PPEB Peb = NtCurrentPeb(); DPRINT("BasePushProcessParameters\n"); /* Get the full path name */ @@ -835,9 +811,14 @@ if ((Size) && (Size <= (MAX_PATH + 4))) { /* Get the DLL Path */ - DllPathString = BaseComputeProcessDllPath(ApplicationPathName, - Environment); - if (!DllPathString) return STATUS_NO_MEMORY; + DllPathString = BaseComputeProcessDllPath((LPWSTR)ApplicationPathName, + lpEnvironment); + if (!DllPathString) + { + /* Fail */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); @@ -846,14 +827,18 @@ else { /* Get the DLL Path */ - DllPathString = BaseComputeProcessDllPath(FullPath, Environment); - if (!DllPathString) return STATUS_NO_MEMORY; + DllPathString = BaseComputeProcessDllPath(FullPath, lpEnvironment); + if (!DllPathString) + { + /* Fail */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); RtlInitUnicodeString(&ImageName, FullPath); } - DPRINT("DllPath: %wZ, ImageName: %wZ\n", DllPath, ImageName); /* Initialize Strings */ RtlInitUnicodeString(&CommandLine, lpCommandLine); @@ -889,38 +874,50 @@ Runtime.Buffer = (LPWSTR)StartupInfo->lpReserved2; Runtime.MaximumLength = Runtime.Length = StartupInfo->cbReserved2; + /* Enforce no app compat data if the pointer was NULL */ + if (!AppCompatData) AppCompatDataSize = 0; + /* Create the Parameter Block */ - DPRINT("Creating Process Parameters: %wZ %wZ %wZ %wZ %wZ %wZ %wZ\n", - &ImageName, &DllPath, &CommandLine, &Desktop, &Title, &Shell, - &Runtime); + ProcessParameters = NULL; Status = RtlCreateProcessParameters(&ProcessParameters, &ImageName, &DllPath, lpCurrentDirectory ? &CurrentDirectory : NULL, &CommandLine, - Environment, + lpEnvironment, &Title, &Desktop, &Shell, &Runtime); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create process parameters!\n"); - return Status; - } + if (!NT_SUCCESS(Status)) goto FailPath; /* Clear the current directory handle if not inheriting */ if (!InheritHandles) ProcessParameters->CurrentDirectory.Handle = NULL; + /* Check if the user passed in an environment */ + if (lpEnvironment) + { + /* We should've made it part of the parameters block, enforce this */ + ASSERT(ProcessParameters->Environment == lpEnvironment); + lpEnvironment = ProcessParameters->Environment; + } + else + { + /* The user did not, so use the one from the current PEB */ + HavePebLock = TRUE; + RtlAcquirePebLock(); + lpEnvironment = Peb->ProcessParameters->Environment; + } + /* Save pointer and start lookup */ - Environment = ScanChar = ProcessParameters->Environment; - if (Environment) + ScanChar = lpEnvironment; + if (lpEnvironment) { /* Find the environment size */ - while (*ScanChar) ScanChar += wcslen(ScanChar) + 1; - EnviroSize = (ULONG_PTR)ScanChar - (ULONG_PTR)Environment; - DPRINT("EnvironmentSize %ld\n", EnviroSize); + while ((ScanChar[0]) || (ScanChar[1])) ++ScanChar; + ScanChar += (2 * sizeof(UNICODE_NULL)); + EnviroSize = (ULONG_PTR)ScanChar - (ULONG_PTR)lpEnvironment; /* Allocate and Initialize new Environment Block */ Size = EnviroSize; @@ -931,23 +928,25 @@ &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate Environment Block\n"); - return Status; - } + if (!NT_SUCCESS(Status)) goto FailPath; /* Write the Environment Block */ Status = ZwWriteVirtualMemory(ProcessHandle, ProcessParameters->Environment, - Environment, + lpEnvironment, EnviroSize, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to write Environment Block\n"); - return Status; - } + + /* No longer need the PEB lock anymore */ + if (HavePebLock) + { + /* Release it */ + RtlReleasePebLock(); + HavePebLock = FALSE; + } + + /* Check if the write failed */ + if (!NT_SUCCESS(Status)) goto FailPath; } /* Write new parameters */ @@ -965,7 +964,6 @@ if (StartupInfo->dwFlags & (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE)) { - DPRINT("Using Standard Handles\n"); ProcessParameters->StandardInput = StartupInfo->hStdInput; ProcessParameters->StandardOutput = StartupInfo->hStdOutput; ProcessParameters->StandardError = StartupInfo->hStdError; @@ -987,17 +985,28 @@ else { /* Inherit our Console Handle */ - ProcessParameters->ConsoleHandle = OurPeb->ProcessParameters->ConsoleHandle; - - /* Is the shell trampling on our Handles? */ + ProcessParameters->ConsoleHandle = Peb->ProcessParameters->ConsoleHandle; + + /* Make sure that the shell isn't trampling on our handles first */ if (!(StartupInfo->dwFlags & (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) { - /* Use handles from PEB, if inheriting or they are console */ - DPRINT("Copying handles from parent\n"); - BasepCopyHandles(ProcessParameters, - OurPeb->ProcessParameters, - InheritHandles); + /* Copy the handle if we are inheriting or if it's a console handle */ + if ((InheritHandles) || + (IsConsoleHandle(Peb->ProcessParameters->StandardInput))) + { + ProcessParameters->StandardInput = Peb->ProcessParameters->StandardInput; + } + if ((InheritHandles) || + (IsConsoleHandle(Peb->ProcessParameters->StandardOutput))) + { + ProcessParameters->StandardOutput = Peb->ProcessParameters->StandardOutput; + } + if ((InheritHandles) || + (IsConsoleHandle(Peb->ProcessParameters->StandardError))) + { + ProcessParameters->StandardError = Peb->ProcessParameters->StandardError; + } } } @@ -1009,30 +1018,27 @@ } /* See if the first 1MB should be reserved */ - if ((ULONG_PTR)ApplicationPathName & 1) + if (ParameterFlags & 1) { ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; } /* See if the first 16MB should be reserved */ - if ((ULONG_PTR)ApplicationPathName & 2) + if (ParameterFlags & 2) { ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_16MB; } /* Allocate memory for the parameter block */ Size = ProcessParameters->Length; + RemoteParameters = NULL; Status = NtAllocateVirtualMemory(ProcessHandle, (PVOID*)&RemoteParameters, 0, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate Parameters Block\n"); - return Status; - } + if (!NT_SUCCESS(Status)) goto FailPath; /* Set the allocated size */ ProcessParameters->MaximumLength = Size; @@ -1053,33 +1059,71 @@ ProcessParameters, ProcessParameters->Length, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to write Parameters Block\n"); - return Status; - } + if (!NT_SUCCESS(Status)) goto FailPath; /* Write the PEB Pointer */ Status = NtWriteVirtualMemory(ProcessHandle, - &Peb->ProcessParameters, + &RemotePeb->ProcessParameters, &RemoteParameters, sizeof(PVOID), NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to write Parameters Block\n"); - return Status; - } - - /* FIXME: Write Peb->ImageSubSystem */ - - + if (!NT_SUCCESS(Status)) goto FailPath; + + /* Check if there's any app compat data to write */ + RemoteAppCompatData = NULL; + if (AppCompatData) + { + /* Allocate some space for the application compatibility data */ + Size = AppCompatDataSize; + Status = NtAllocateVirtualMemory(ProcessHandle, + &RemoteAppCompatData, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) goto FailPath; + + /* Write the application compatibility data */ + Status = NtWriteVirtualMemory(ProcessHandle, + RemoteAppCompatData, + AppCompatData, + AppCompatDataSize, + NULL); + if (!NT_SUCCESS(Status)) goto FailPath; + } + + /* Write the PEB Pointer to the app compat data (might be NULL) */ + Status = NtWriteVirtualMemory(ProcessHandle, + &RemotePeb->pShimData, + &RemoteAppCompatData, + sizeof(PVOID), + NULL); + if (!NT_SUCCESS(Status)) goto FailPath; + + /* Now write Peb->ImageSubSystem */ + if (ImageSubsystem) + { + NtWriteVirtualMemory(ProcessHandle, + &RemotePeb->ImageSubsystem, + &ImageSubsystem, + sizeof(ImageSubsystem), + NULL); + } + + /* Success path */ + Result = TRUE; + +Quickie: /* Cleanup */ + if (HavePebLock) RtlReleasePebLock(); RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath.Buffer); - RtlDestroyProcessParameters(ProcessParameters); - - DPRINT("Completed\n"); - return STATUS_SUCCESS; + if (ProcessParameters) RtlDestroyProcessParameters(ProcessParameters); + return Result; +FailPath: + DPRINT1("Failure to create proecss parameters: %lx\n", Status); + BaseSetLastNTError(Status); + Result = FALSE; + goto Quickie; } VOID @@ -3058,29 +3102,26 @@ /* Create Process Environment */ RemotePeb = ProcessBasicInfo.PebBaseAddress; - Status = BasePushProcessParameters(hProcess, - RemotePeb, - (LPWSTR)lpApplicationName, - CurrentDirectory, - (QuotesNeeded || CmdLineIsAppName || Escape) ? - QuotedCmdLine : lpCommandLine, - lpEnvironment, - EnvSize, - &StartupInfo, - dwCreationFlags, - bInheritHandles); + Ret = BasePushProcessParameters(0, + hProcess, + RemotePeb, + (LPWSTR)lpApplicationName, + CurrentDirectory, + (QuotesNeeded || CmdLineIsAppName || Escape) ? + QuotedCmdLine : lpCommandLine, + lpEnvironment, + &StartupInfo, + dwCreationFlags, + bInheritHandles, + 0, + NULL, + 0); + if (!Ret) goto Cleanup; /* Cleanup Environment */ if (lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) { RtlDestroyEnvironment(lpEnvironment); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not initialize Process Environment\n"); - BaseSetLastNTError(Status); - goto Cleanup; } /* Close the section */ Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Mon Jan 16 21:27:50 2012 @@ -450,6 +450,19 @@ LARGE_INTEGER ViewBase; } BASE_MSG_SXS_HANDLES, *PBASE_MSG_SXS_HANDLES; +typedef struct _SXS_WIN32_NT_PATH_PAIR +{ + PUNICODE_STRING Win32; + PUNICODE_STRING Nt; +} SXS_WIN32_NT_PATH_PAIR, *PSXS_WIN32_NT_PATH_PAIR; + +typedef struct _SXS_OVERRIDE_MANIFEST +{ + PCWCH Name; + PVOID Address; + ULONG Size; +} SXS_OVERRIDE_MANIFEST, *PSXS_OVERRIDE_MANIFEST; + NTSTATUS NTAPI BasepConfigureAppCertDlls( @@ -464,6 +477,15 @@ extern LIST_ENTRY BasepAppCertDllsList; extern RTL_CRITICAL_SECTION gcsAppCert; +BOOL +WINAPI +BaseUpdateVDMEntry( + IN ULONG UpdateIndex, + IN OUT PHANDLE WaitHandle, + IN ULONG IndexInfo, + IN ULONG BinaryType +); + VOID WINAPI BaseMarkFileForDelete( @@ -471,3 +493,10 @@ IN ULONG FileAttributes ); +/* FIXME: This is EXPORTED! It should go in an external kernel32.h header */ +VOID +WINAPI +BasepFreeAppCompatData( + IN PVOID AppCompatData, + IN PVOID AppCompatSxsData +); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Jan 16 21:27:50 2012 @@ -1380,6 +1380,26 @@ PVOID *Trace; } RTL_TRACE_BLOCK, *PRTL_TRACE_BLOCK; +// +// Auto-Managed Rtl* String Buffer +// +typedef struct _RTL_BUFFER +{ + PUCHAR Buffer; + PUCHAR StaticBuffer; + SIZE_T Size; + SIZE_T StaticSize; + SIZE_T ReservedForAllocatedSize; + PVOID ReservedForIMalloc; +} RTL_BUFFER, *PRTL_BUFFER; + +typedef struct _RTL_UNICODE_STRING_BUFFER +{ + UNICODE_STRING String; + RTL_BUFFER ByteBuffer; + WCHAR MinimumStaticBufferForTerminalNul; +} RTL_UNICODE_STRING_BUFFER, *PRTL_UNICODE_STRING_BUFFER; + #ifndef NTOS_MODE_USER // Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Mon Jan 16 21:27:50 2012 @@ -31,11 +31,46 @@ ULONG Dummy; } CSRSS_CONNECT_PROCESS, *PCSRSS_CONNECT_PROCESS; -typedef struct -{ - HANDLE NewProcessId; - ULONG Flags; - BOOL bInheritHandles; +typedef struct _BASE_SXS_CREATEPROCESS_MSG +{ + ULONG Flags; + ULONG ProcessParameterFlags; + HANDLE FileHandle; + UNICODE_STRING SxsWin32ExePath; + UNICODE_STRING SxsNtExePath; + SIZE_T OverrideManifestOffset; + ULONG OverrideManifestSize; + SIZE_T OverridePolicyOffset; + ULONG OverridePolicySize; + PVOID PEManifestAddress; + ULONG PEManifestSize; + UNICODE_STRING CultureFallbacks; + ULONG Unknown[7]; + UNICODE_STRING AssemblyName; +} BASE_SXS_CREATEPROCESS_MSG, *PBASE_SXS_CREATEPROCESS_MSG; + +typedef struct +{ + // + // NT-type structure (BASE_CREATEPROCESS_MSG) + // + HANDLE ProcessHandle; + HANDLE ThreadHandle; + CLIENT_ID ClientId; + ULONG CreationFlags; + ULONG VdmBinaryType; + ULONG VdmTask; + HANDLE hVDM; + BASE_SXS_CREATEPROCESS_MSG Sxs; + PVOID PebAddressNative; + ULONG PebAddressWow64; + USHORT ProcessorArchitecture; + // + // ReactOS Data + // + HANDLE NewProcessId; + ULONG Flags; + BOOL bInheritHandles; } CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; typedef struct @@ -547,6 +582,38 @@ HANDLE hParent; ULONG ExitCode; } CSRSS_GET_VDM_EXIT_CODE, *PCSRSS_GET_VDM_EXIT_CODE; + +typedef struct +{ + ULONG iTask; + HANDLE ConsoleHandle; + ULONG BinaryType; + HANDLE WaitObjectForParent; + HANDLE StdIn; + HANDLE StdOut; + HANDLE StdErr; + ULONG CodePage; + ULONG dwCreationFlags; + PCHAR CmdLine; + PCHAR appName; + PCHAR PifFile; + PCHAR CurDirectory; + PCHAR Env; + ULONG EnvLen; + PVOID StartupInfo; + PCHAR Desktop; + ULONG DesktopLen; + PCHAR Title; + ULONG TitleLen; + PCHAR Reserved; + ULONG ReservedLen; + USHORT CmdLen; + USHORT AppLen; + USHORT PifLen; + USHORT CurDirectoryLen; + USHORT CurDrive; + USHORT VDMState; +} CSRSS_CHECK_VDM, *PCSRSS_CHECK_VDM; #define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) @@ -632,6 +699,7 @@ #define SOUND_SENTRY (0x50) #define UPDATE_VDM_ENTRY (0x51) #define GET_VDM_EXIT_CODE (0x52) +#define CHECK_VDM (0x53) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -718,6 +786,7 @@ CSRSS_SOUND_SENTRY SoundSentryRequest; CSRSS_UPDATE_VDM_ENTRY UpdateVdmEntry; CSRSS_GET_VDM_EXIT_CODE GetVdmExitCode; + CSRSS_CHECK_VDM CheckVdm; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE;

1 0

[rharabien] 54985: [SHELL32] - Load shell extensions from Directory key only for file system directories. Fixes New menu being added to special folders context menu (for example My Computer or Cont...
by rharabien＠svn.reactos.org 16 Jan '12

16 Jan '12

Author: rharabien Date: Mon Jan 16 19:54:24 2012 New Revision: 54985 URL: http://svn.reactos.org/svn/reactos?rev=54985&view=rev Log: [SHELL32] - Load shell extensions from Directory key only for file system directories. Fixes New menu being added to special folders context menu (for example My Computer or Control Panel) - Load shell extensions from AllFilesystemObjects only for files and directories - Hardcode special folders attributes in proper place Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/newmenu.cpp trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Mon Jan 16 19:54:24 2012 @@ -144,7 +144,7 @@ if (!pdcm->cidl) { - /* Init pidlFolder only if is background context menu. See IShellExtInit::Initialize */ + /* Init pidlFolder only if it is background context menu. See IShellExtInit::Initialize */ if (pdcm->pidlFolder) m_pidlFolder = ILClone(pdcm->pidlFolder); else @@ -513,7 +513,7 @@ TRACE("BuildBackgroundContextMenu entered\n"); - if (!_ILIsDesktop(m_Dcm.pidlFolder)) + if (!_ILIsDesktop(m_pidlFolder)) { WCHAR wszBuf[MAX_PATH]; @@ -552,18 +552,24 @@ DisablePasteOptions(hMenu); } - /* Load context menu handlers */ - HKEY hKey; - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory\\Background", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(hKey); - RegCloseKey(hKey); - } - - if (InsertMenuItemsOfDynamicContextMenuExtension(hMenu, GetMenuItemCount(hMenu) - 1, iIdCmdFirst, iIdCmdLast)) - { - /* seperate dynamic context menu items */ - _InsertMenuItemW(hMenu, GetMenuItemCount(hMenu) - 1, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); + /* Directory is progid of filesystem folders only */ + LPITEMIDLIST pidlFolderLast = ILFindLastID(m_pidlFolder); + if (_ILIsDesktop(pidlFolderLast) || _ILIsDrive(pidlFolderLast) || _ILIsFolder(pidlFolderLast)) + { + /* Load context menu handlers */ + TRACE("Add background handlers: %p\n", m_pidlFolder); + HKEY hKey; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory\\Background", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(hKey); + RegCloseKey(hKey); + } + + if (InsertMenuItemsOfDynamicContextMenuExtension(hMenu, GetMenuItemCount(hMenu) - 1, iIdCmdFirst, iIdCmdLast)) + { + /* seperate dynamic context menu items */ + _InsertMenuItemW(hMenu, GetMenuItemCount(hMenu) - 1, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); + } } return iIdCmdLast; @@ -795,24 +801,30 @@ rfg = 0; } - if ((rfg & SFGAO_FOLDER) || _ILIsControlPanel(m_Dcm.apidl[0])) + if (rfg & SFGAO_FOLDER) { /* add the default verbs open / explore */ AddStaticEntryForFileClass(L"Folder"); - AddStaticEntryForFileClass(L"Directory"); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Folder", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { EnumerateDynamicContextHandlerForKey(hKey); RegCloseKey(hKey); } - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(hKey); - RegCloseKey(hKey); - } - } - - if (rfg & SFGAO_FILESYSTEM) + + /* Directory is only loaded for real filesystem directories */ + if (_ILIsFolder(m_Dcm.apidl[0])) + { + AddStaticEntryForFileClass(L"Directory"); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(hKey); + RegCloseKey(hKey); + } + } + } + + /* AllFilesystemObjects class is loaded only for files and directories */ + if (_ILIsFolder(m_Dcm.apidl[0]) || _ILIsValue(m_Dcm.apidl[0])) { if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Mon Jan 16 19:54:24 2012 @@ -540,17 +540,18 @@ { HRESULT hr = S_OK; static const DWORD dwDesktopAttributes = - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_STORAGEANCESTOR | SFGAO_HASPROPSHEET | SFGAO_STORAGE | SFGAO_CANLINK; static const DWORD dwMyComputerAttributes = - SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | - SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; + static DWORD dwMyNetPlacesAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); - if (!rgfInOut) - return E_INVALIDARG; if (cidl && !apidl) return E_INVALIDARG; @@ -558,23 +559,21 @@ *rgfInOut = ~0; if(cidl == 0) - { *rgfInOut &= dwDesktopAttributes; - } else { - while (cidl > 0 && *apidl) + /* TODO: always add SFGAO_CANLINK */ + for (UINT i = 0; i < cidl; ++i) { pdump(*apidl); if (_ILIsDesktop(*apidl)) *rgfInOut &= dwDesktopAttributes; - else if (_ILIsMyComputer(*apidl)) + else if (_ILIsMyComputer(apidl[i])) *rgfInOut &= dwMyComputerAttributes; + else if (_ILIsNetHood(apidl[i])) + *rgfInOut &= dwMyNetPlacesAttributes; else - SHELL32_GetItemAttributes((IShellFolder *)this, *apidl, rgfInOut); - - apidl++; - cidl--; + SHELL32_GetItemAttributes((IShellFolder *)this, apidl[i], rgfInOut); } } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Mon Jan 16 19:54:24 2012 @@ -365,39 +365,48 @@ */ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { - HRESULT hr = S_OK; static const DWORD dwComputerAttributes = - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_CANCOPY | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; + static const DWORD dwControlPanelAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; + static const DWORD dwDriveAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); - if (!rgfInOut) - return E_INVALIDARG; if (cidl && !apidl) return E_INVALIDARG; if (*rgfInOut == 0) *rgfInOut = ~0; + /* FIXME: always add SFGAO_CANLINK */ if(cidl == 0) *rgfInOut &= dwComputerAttributes; else { - while (cidl > 0 && *apidl) + for (UINT i = 0; i < cidl; ++i) { - pdump (*apidl); - SHELL32_GetItemAttributes (this, *apidl, rgfInOut); - apidl++; - cidl--; + if (_ILIsDrive(apidl[i])) + *rgfInOut &= dwDriveAttributes; + else if (_ILIsControlPanel(apidl[i])) + *rgfInOut &= dwControlPanelAttributes; + else + { + pdump(apidl[i]); + SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); + } } } + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; TRACE ("-- result=0x%08x\n", *rgfInOut); - return hr; + return S_OK; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Mon Jan 16 19:54:24 2012 @@ -643,6 +643,7 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { + /* Load folder and shortcut icons */ HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, LR_SHARED); m_hbmFolder = hIcon ? IconToBitmap(hIcon) : NULL; hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, LR_SHARED); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Jan 16 19:54:24 2012 @@ -397,17 +397,7 @@ dwAttributes = *pdwAttributes; - /* Attributes of some special folders are hardcoded */ - if (_ILIsDrive(pidl)) - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME; - else if (_ILIsMyComputer(pidl) || _ILIsNetHood(pidl)) - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANDELETE| - SFGAO_CANRENAME|SFGAO_CANLINK; - else if (_ILIsControlPanel(pidl)) - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_CANLINK; - else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) + if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) *pdwAttributes = dwAttributes; else if (_ILGetDataPointer(pidl)) {

1 0

[iut2011] 54984: [MMC] Fix wrong IDs due to code generation error
by iut2011＠svn.reactos.org 16 Jan '12

16 Jan '12

Author: iut2011 Date: Mon Jan 16 11:01:37 2012 New Revision: 54984 URL: http://svn.reactos.org/svn/reactos?rev=54984&view=rev Log: [MMC] Fix wrong IDs due to code generation error Modified: branches/iut-mmc/lib/sdk/mmc/mmciid.c Modified: branches/iut-mmc/lib/sdk/mmc/mmciid.c URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/mmc/mmciid.c?re… ============================================================================== --- branches/iut-mmc/lib/sdk/mmc/mmciid.c [iso-8859-1] (original) +++ branches/iut-mmc/lib/sdk/mmc/mmciid.c [iso-8859-1] Mon Jan 16 11:01:37 2012 @@ -21,97 +21,97 @@ #include "windef.h" #include "initguid.h" -DEFINE_GUID(CLSID_Application, 0x49b2791a, 0xb1ae, 0x4c90, 0x9b, 0x8e ,0xe8, 0x60, 0x60, 0xba, 0x7, 0xf8); -DEFINE_GUID(CLSID_ConsolePower, 0xf0285374, 0xdff1, 0x11d3, 0xb4, 0x33 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); -DEFINE_GUID(CLSID_ExecutivePlatform, 0xb3fd5602, 0xeb0f, 0x415e, 0x9f, 0x32 ,0x75, 0xda, 0xda, 0x39, 0x1d, 0x6b); -DEFINE_GUID(CLSID_FrameworkSnapInFactory, 0xd5ab5662, 0x131d, 0x453d, 0x88, 0xc8 ,0x9b, 0xba, 0xba, 0x87, 0x50, 0x2a); -DEFINE_GUID(CLSID_MMCVersionInfo, 0xd6fedb1d, 0xcf21, 0x4bd9, 0xaf, 0x3b ,0xc5, 0x46, 0x46, 0x8e, 0x9c, 0x66); -DEFINE_GUID(CLSID_SnapInFailureReporter, 0x4a65d267, 0x1539, 0x4bd1, 0x92, 0x1d ,0x1c, 0x49, 0x49, 0xb3, 0xe5, 0x8e); -DEFINE_GUID(CLSID_WaitDialog, 0x2d11cf10, 0x4fe0, 0x45b2, 0x88, 0xdf ,0x6f, 0xfb, 0xfb, 0xf9, 0x2b, 0xe9); -DEFINE_GUID(DIID_AppEvents, 0xfc7a4252, 0x78ac, 0x4532, 0x8c, 0x5a ,0x56, 0x3c, 0x3c, 0xfe, 0x13, 0x88); -DEFINE_GUID(IID_Column, 0xfd1c5f63, 0x2b16, 0x4d06, 0x9a, 0xb3 ,0xf4, 0x53, 0x53, 0x50, 0xb9, 0x40); -DEFINE_GUID(IID_Columns, 0x383d4d97, 0xfc44, 0x478b, 0xb1, 0x39 ,0x63, 0x23, 0x23, 0xdc, 0x48, 0x61); -DEFINE_GUID(IID_ContextMenu, 0xdab39ce0, 0x25e6, 0x4e07, 0x83, 0x62 ,0xba, 0x9c, 0x9c, 0x95, 0x70, 0x65); -DEFINE_GUID(IID_Document, 0x225120d6, 0x1e0f, 0x40a3, 0x93, 0xfe ,0x10, 0x79, 0x79, 0xe6, 0xa8, 0x1); -DEFINE_GUID(IID_Extension, 0xad4d6ca6, 0x912f, 0x409b, 0xa2, 0x6e ,0x7f, 0xd2, 0xd2, 0x34, 0xae, 0xf5); -DEFINE_GUID(IID_Extensions, 0x82dbea43, 0x8ca4, 0x44bc, 0xa2, 0xca ,0xd1, 0x87, 0x87, 0x41, 0x5, 0x9e); -DEFINE_GUID(IID_Frame, 0xe5e2d970, 0x5bb3, 0x4306, 0x88, 0x4 ,0xb0, 0x96, 0x96, 0x8a, 0x31, 0xc8); -DEFINE_GUID(IID_IActionsPane, 0xd55cd1d0, 0x1b5, 0x4842, 0xb3, 0x44 ,0xd6, 0x1, 0x1, 0x56, 0x4e, 0xa2); -DEFINE_GUID(IID_IColumnData, 0x547c1354, 0x24d, 0x11d3, 0xa7, 0x7 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xf4); -DEFINE_GUID(IID_IComponent, 0x43136eb2, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IComponent2, 0x79a2d615, 0x4a10, 0x4ed4, 0x8c, 0x65 ,0x86, 0x33, 0x33, 0xf9, 0x33, 0x50); -DEFINE_GUID(IID_IComponentData, 0x955ab28a, 0x5218, 0x11d0, 0xa9, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IComponentData2, 0xcca0f2d2, 0x82de, 0x41b5, 0xbf, 0x47 ,0x3b, 0x20, 0x20, 0x76, 0x27, 0x3d); -DEFINE_GUID(IID_IComponentPrivate, 0x734cf88d, 0x4250, 0x470e, 0xba, 0x34 ,0x93, 0xd9, 0xd9, 0x56, 0x12, 0x4f); -DEFINE_GUID(IID_IConsole, 0x43136eb1, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IConsole2, 0x103d842a, 0xaa63, 0x11d1, 0xa7, 0xe1 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IConsole3, 0x4f85efdb, 0xd0e1, 0x498c, 0x8d, 0x4a ,0xd0, 0x10, 0x10, 0xdf, 0xdd, 0x40); -DEFINE_GUID(IID_IConsole4, 0x25f01e57, 0x83c8, 0x4be0, 0xbe, 0x9c ,0xeb, 0x32, 0x32, 0x12, 0xe3, 0xac); -DEFINE_GUID(IID_IConsoleNameSpace, 0xbedeb620, 0xf24d, 0x11cf, 0x8a, 0xfc ,00, 0xaa, 0xaa, 00, 0x3c, 0xa9); -DEFINE_GUID(IID_IConsoleNameSpace2, 0x255f18cc, 0x65db, 0x11d1, 0xa7, 0xdc ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IConsolePower, 0x1cfbdd0e, 0x62ca, 0x49ce, 0xa3, 0xaf ,0xdb, 0xb2, 0xb2, 0xde, 0x61, 0xb0); -DEFINE_GUID(IID_IConsolePowerSink, 0x3333759f, 0xfe4f, 0x4975, 0xb1, 0x43 ,0xfe, 0xc0, 0xc0, 0xa5, 0xdd, 0x6d); -DEFINE_GUID(IID_IConsoleVerb, 0xe49f7a60, 0x74af, 0x11d0, 0xa2, 0x86 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xfe); -DEFINE_GUID(IID_IContextMenuCallback, 0x43136eb7, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IContextMenuCallback2, 0xe178bc0e, 0x2ed0, 0x4b5e, 0x80, 0x97 ,0x42, 0xc9, 0xc9, 0x8, 0x7e, 0x8b); -DEFINE_GUID(IID_IContextMenuProvider, 0x43136eb6, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IControlbar, 0x69fb811e, 0x6c1c, 0x11d0, 0xa2, 0xcb ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); -DEFINE_GUID(IID_ICustomInitializationWizard, 0x15363ca4, 0xe235, 0x44f2, 0x87, 0x8c ,0xc5, 0xe6, 0xe6, 0x5b, 0xc3, 0x42); -DEFINE_GUID(IID_IDisplayHelp, 0xcc593830, 0xb926, 0x11d1, 0x80, 0x63 ,00, 00, 00, 0xf8, 0x75, 0xa9); -DEFINE_GUID(IID_IEnumTASK, 0x338698b1, 0x5a02, 0x11d1, 0x9f, 0xec ,00, 0x60, 0x60, 0x8, 0x32, 0xdb); -DEFINE_GUID(IID_IExecutivePlatform, 0x8d0203ce, 0xd4f9, 0x4641, 0x95, 0x58 ,0xd9, 0xb1, 0xb1, 0xc1, 0x8f, 0xa9); -DEFINE_GUID(IID_IExtendActionsPane, 0xc60ce72c, 0xe13b, 0x4775, 0xbc, 0x1d ,0xc8, 0x33, 0x33, 0xf6, 0xea, 0x1e); -DEFINE_GUID(IID_IExtendContextMenu, 0x4f3b7a4f, 0xcfac, 0x11cf, 0xb8, 0xe3 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IExtendControlbar, 0x49506520, 0x6f40, 0x11d0, 0xa9, 0x8b ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IExtendPropertySheet, 0x85de64dc, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); -DEFINE_GUID(IID_IExtendPropertySheet2, 0xb7a87232, 0x4a51, 0x11d1, 0xa7, 0xea ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); -DEFINE_GUID(IID_IExtendPropertySheetPrivate, 0x27aea402, 0x2c17, 0x4a18, 0xb0, 0x17 ,0xe5, 0xa6, 0xa6, 0xea, 0x63, 0xc6); -DEFINE_GUID(IID_IExtendTaskPad, 0x8dee6511, 0x554d, 0x11d1, 0x9f, 0xea ,00, 0x60, 0x60, 0x8, 0x32, 0xdb); -DEFINE_GUID(IID_IExtendView, 0x89995cee, 0xd2ed, 0x4c0e, 0xae, 0x5e ,0xdf, 0x7e, 0x7e, 0x76, 0xf3, 0xfa); -DEFINE_GUID(IID_IFormHost, 0xb5f3b64d, 0xb22e, 0x4ea4, 0x9b, 0x98 ,0x53, 0x1, 0x1, 0x6f, 0x1a, 0x7a); -DEFINE_GUID(IID_IFormViewAccessibility, 0xe693927, 0xc23f, 0x41b0, 0x95, 0x19 ,0xd9, 0x30, 0x30, 0x57, 0x25, 0x47); -DEFINE_GUID(IID_IHeaderCtrl, 0x43136eb3, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IHeaderCtrl2, 0x9757abb8, 0x1b32, 0x11d1, 0xa7, 0xce ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); -DEFINE_GUID(IID_IImageList, 0x43136eb8, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IMMCVersionInfo, 0xa8d2c5fe, 0xcdcb, 0x4b9d, 0xbd, 0xe5 ,0xa2, 0x73, 0x73, 0x43, 0xff, 0x54); +DEFINE_GUID(CLSID_Application, 0x49b2791a, 0xb1ae, 0x4c90, 0x9b, 0x8e ,0xe8, 0x60, 0xba, 0x7, 0xf8, 0x89); +DEFINE_GUID(CLSID_ConsolePower, 0xf0285374, 0xdff1, 0x11d3, 0xb4, 0x33 ,00, 0xc0, 0x4f, 0x8e, 0xcd, 0x78); +DEFINE_GUID(CLSID_ExecutivePlatform, 0xb3fd5602, 0xeb0f, 0x415e, 0x9f, 0x32 ,0x75, 0xda, 0x39, 0x1d, 0x6b, 0xf9); +DEFINE_GUID(CLSID_FrameworkSnapInFactory, 0xd5ab5662, 0x131d, 0x453d, 0x88, 0xc8 ,0x9b, 0xba, 0x87, 0x50, 0x2a, 0xde); +DEFINE_GUID(CLSID_MMCVersionInfo, 0xd6fedb1d, 0xcf21, 0x4bd9, 0xaf, 0x3b ,0xc5, 0x46, 0x8e, 0x9c, 0x66, 0x84); +DEFINE_GUID(CLSID_SnapInFailureReporter, 0x4a65d267, 0x1539, 0x4bd1, 0x92, 0x1d ,0x1c, 0x49, 0xb3, 0xe5, 0x8e, 0xb7); +DEFINE_GUID(CLSID_WaitDialog, 0x2d11cf10, 0x4fe0, 0x45b2, 0x88, 0xdf ,0x6f, 0xfb, 0xf9, 0x2b, 0xe9, 0xab); +DEFINE_GUID(DIID_AppEvents, 0xfc7a4252, 0x78ac, 0x4532, 0x8c, 0x5a ,0x56, 0x3c, 0xfe, 0x13, 0x88, 0x63); +DEFINE_GUID(IID_Column, 0xfd1c5f63, 0x2b16, 0x4d06, 0x9a, 0xb3 ,0xf4, 0x53, 0x50, 0xb9, 0x40, 0xab); +DEFINE_GUID(IID_Columns, 0x383d4d97, 0xfc44, 0x478b, 0xb1, 0x39 ,0x63, 0x23, 0xdc, 0x48, 0x61, 0x1c); +DEFINE_GUID(IID_ContextMenu, 0xdab39ce0, 0x25e6, 0x4e07, 0x83, 0x62 ,0xba, 0x9c, 0x95, 0x70, 0x65, 0x45); +DEFINE_GUID(IID_Document, 0x225120d6, 0x1e0f, 0x40a3, 0x93, 0xfe ,0x10, 0x79, 0xe6, 0xa8, 0x1, 0x7b); +DEFINE_GUID(IID_Extension, 0xad4d6ca6, 0x912f, 0x409b, 0xa2, 0x6e ,0x7f, 0xd2, 0x34, 0xae, 0xf5, 0x42); +DEFINE_GUID(IID_Extensions, 0x82dbea43, 0x8ca4, 0x44bc, 0xa2, 0xca ,0xd1, 0x87, 0x41, 0x5, 0x9e, 0xc8); +DEFINE_GUID(IID_Frame, 0xe5e2d970, 0x5bb3, 0x4306, 0x88, 0x4 ,0xb0, 0x96, 0x8a, 0x31, 0xc8, 0xe6); +DEFINE_GUID(IID_IActionsPane, 0xd55cd1d0, 0x1b5, 0x4842, 0xb3, 0x44 ,0xd6, 0x1, 0x56, 0x4e, 0xa2, 0xf5); +DEFINE_GUID(IID_IColumnData, 0x547c1354, 0x24d, 0x11d3, 0xa7, 0x7 ,00, 0xc0, 0x4f, 0x8e, 0xf4, 0xcb); +DEFINE_GUID(IID_IComponent, 0x43136eb2, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IComponent2, 0x79a2d615, 0x4a10, 0x4ed4, 0x8c, 0x65 ,0x86, 0x33, 0xf9, 0x33, 0x50, 0x95); +DEFINE_GUID(IID_IComponentData, 0x955ab28a, 0x5218, 0x11d0, 0xa9, 0x85 ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0x65); +DEFINE_GUID(IID_IComponentData2, 0xcca0f2d2, 0x82de, 0x41b5, 0xbf, 0x47 ,0x3b, 0x20, 0x76, 0x27, 0x3d, 0x5c); +DEFINE_GUID(IID_IComponentPrivate, 0x734cf88d, 0x4250, 0x470e, 0xba, 0x34 ,0x93, 0xd9, 0x56, 0x12, 0x4f, 0x3e); +DEFINE_GUID(IID_IConsole, 0x43136eb1, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IConsole2, 0x103d842a, 0xaa63, 0x11d1, 0xa7, 0xe1 ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0x65); +DEFINE_GUID(IID_IConsole3, 0x4f85efdb, 0xd0e1, 0x498c, 0x8d, 0x4a ,0xd0, 0x10, 0xdf, 0xdd, 0x40, 0x4f); +DEFINE_GUID(IID_IConsole4, 0x25f01e57, 0x83c8, 0x4be0, 0xbe, 0x9c ,0xeb, 0x32, 0x12, 0xe3, 0xac, 0xe7); +DEFINE_GUID(IID_IConsoleNameSpace, 0xbedeb620, 0xf24d, 0x11cf, 0x8a, 0xfc ,00, 0xaa, 00, 0x3c, 0xa9, 0xf6); +DEFINE_GUID(IID_IConsoleNameSpace2, 0x255f18cc, 0x65db, 0x11d1, 0xa7, 0xdc ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0x65); +DEFINE_GUID(IID_IConsolePower, 0x1cfbdd0e, 0x62ca, 0x49ce, 0xa3, 0xaf ,0xdb, 0xb2, 0xde, 0x61, 0xb0, 0x68); +DEFINE_GUID(IID_IConsolePowerSink, 0x3333759f, 0xfe4f, 0x4975, 0xb1, 0x43 ,0xfe, 0xc0, 0xa5, 0xdd, 0x6d, 0x65); +DEFINE_GUID(IID_IConsoleVerb, 0xe49f7a60, 0x74af, 0x11d0, 0xa2, 0x86 ,00, 0xc0, 0x4f, 0xd8, 0xfe, 0x93); +DEFINE_GUID(IID_IContextMenuCallback, 0x43136eb7, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IContextMenuCallback2, 0xe178bc0e, 0x2ed0, 0x4b5e, 0x80, 0x97 ,0x42, 0xc9, 0x8, 0x7e, 0x8b, 0x33); +DEFINE_GUID(IID_IContextMenuProvider, 0x43136eb6, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IControlbar, 0x69fb811e, 0x6c1c, 0x11d0, 0xa2, 0xcb ,00, 0xc0, 0x4f, 0xd9, 0x9, 0xdd); +DEFINE_GUID(IID_ICustomInitializationWizard, 0x15363ca4, 0xe235, 0x44f2, 0x87, 0x8c ,0xc5, 0xe6, 0x5b, 0xc3, 0x42, 0x8a); +DEFINE_GUID(IID_IDisplayHelp, 0xcc593830, 0xb926, 0x11d1, 0x80, 0x63 ,00, 00, 0xf8, 0x75, 0xa9, 0xce); +DEFINE_GUID(IID_IEnumTASK, 0x338698b1, 0x5a02, 0x11d1, 0x9f, 0xec ,00, 0x60, 0x8, 0x32, 0xdb, 0x4a); +DEFINE_GUID(IID_IExecutivePlatform, 0x8d0203ce, 0xd4f9, 0x4641, 0x95, 0x58 ,0xd9, 0xb1, 0xc1, 0x8f, 0xa9, 0xa5); +DEFINE_GUID(IID_IExtendActionsPane, 0xc60ce72c, 0xe13b, 0x4775, 0xbc, 0x1d ,0xc8, 0x33, 0xf6, 0xea, 0x1e, 0xef); +DEFINE_GUID(IID_IExtendContextMenu, 0x4f3b7a4f, 0xcfac, 0x11cf, 0xb8, 0xe3 ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0xb0); +DEFINE_GUID(IID_IExtendControlbar, 0x49506520, 0x6f40, 0x11d0, 0xa9, 0x8b ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0x65); +DEFINE_GUID(IID_IExtendPropertySheet, 0x85de64dc, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0x4f, 0xd8, 0xdb, 0xe6); +DEFINE_GUID(IID_IExtendPropertySheet2, 0xb7a87232, 0x4a51, 0x11d1, 0xa7, 0xea ,00, 0xc0, 0x4f, 0xd9, 0x9, 0xdd); +DEFINE_GUID(IID_IExtendPropertySheetPrivate, 0x27aea402, 0x2c17, 0x4a18, 0xb0, 0x17 ,0xe5, 0xa6, 0xea, 0x63, 0xc6, 0x88); +DEFINE_GUID(IID_IExtendTaskPad, 0x8dee6511, 0x554d, 0x11d1, 0x9f, 0xea ,00, 0x60, 0x8, 0x32, 0xdb, 0x4a); +DEFINE_GUID(IID_IExtendView, 0x89995cee, 0xd2ed, 0x4c0e, 0xae, 0x5e ,0xdf, 0x7e, 0x76, 0xf3, 0xfa, 0x53); +DEFINE_GUID(IID_IFormHost, 0xb5f3b64d, 0xb22e, 0x4ea4, 0x9b, 0x98 ,0x53, 0x1, 0x6f, 0x1a, 0x7a, 0xae); +DEFINE_GUID(IID_IFormViewAccessibility, 0xe693927, 0xc23f, 0x41b0, 0x95, 0x19 ,0xd9, 0x30, 0x57, 0x25, 0x47, 0xb2); +DEFINE_GUID(IID_IHeaderCtrl, 0x43136eb3, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IHeaderCtrl2, 0x9757abb8, 0x1b32, 0x11d1, 0xa7, 0xce ,00, 0xc0, 0x4f, 0xd8, 0xd5, 0x65); +DEFINE_GUID(IID_IImageList, 0x43136eb8, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IMMCVersionInfo, 0xa8d2c5fe, 0xcdcb, 0x4b9d, 0xbd, 0xe5 ,0xa2, 0x73, 0x43, 0xff, 0x54, 0xbc); DEFINE_GUID(IID_IMenuButton, 0x951ed750, 0xd080, 0x11d0, 0xb1, 0x97 ,00, 00, 00, 00, 00, 00); -DEFINE_GUID(IID_IMessageView, 0x80f94174, 0xfccc, 0x11d2, 0xb9, 0x91 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); -DEFINE_GUID(IID_INodeProperties, 0x15bc4d24, 0xa522, 0x4406, 0xaa, 0x55 ,0x7, 0x49, 0x49, 0x53, 0x7a, 0x68); -DEFINE_GUID(IID_IPropertySheetCallback, 0x85de64dd, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); -DEFINE_GUID(IID_IPropertySheetProvider, 0x85de64de, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); -DEFINE_GUID(IID_IReportSnapInFailure, 0x1fed3df6, 0x2c3f, 0x461a, 0xba, 0x20 ,0x4b, 0x1d, 0x1d, 0xf6, 0x56, 0x9a); -DEFINE_GUID(IID_IRequiredExtensions, 0x72782d7a, 0xa4a0, 0x11d1, 0xaf, 0xf ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); -DEFINE_GUID(IID_IResultData, 0x31da5fa0, 0xe0eb, 0x11cf, 0x9f, 0x21 ,00, 0xaa, 0xaa, 00, 0x3c, 0xa9); -DEFINE_GUID(IID_IResultData2, 0xf36e0eb, 0xa7f1, 0x4a81, 0xbe, 0x5a ,0x92, 0x47, 0x47, 0xf7, 0xde, 0x4b); -DEFINE_GUID(IID_IResultData3, 0xaef53ae7, 0x99ae, 0x48b4, 0xa7, 0x80 ,0x26, 0x81, 0x81, 0xcf, 0x40, 0x57); -DEFINE_GUID(IID_IResultDataCompare, 0xe8315a52, 0x7a1a, 0x11d0, 0xa2, 0xd2 ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); -DEFINE_GUID(IID_IResultDataCompareEx, 0x96933476, 0x251, 0x11d3, 0xae, 0xb0 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); -DEFINE_GUID(IID_IResultOwnerData, 0x9cb396d8, 0xea83, 0x11d0, 0xae, 0xf1 ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); -DEFINE_GUID(IID_ISnapInConsoleStatus, 0xfb59d905, 0x555b, 0x4892, 0xac, 0xd1 ,0xbd, 0xb, 0xb, 0x3d, 0xea, 0x73); -DEFINE_GUID(IID_ISnapInFactory, 0x1546faac, 0x79a6, 0x4403, 0x9f, 0xe2 ,0x86, 0x1b, 0x1b, 0x9c, 0x88, 0x45); -DEFINE_GUID(IID_ISnapinAbout, 0x1245208c, 0xa151, 0x11d0, 0xa7, 0xd7 ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); -DEFINE_GUID(IID_ISnapinHelp, 0xa6b15ace, 0xdf59, 0x11d0, 0xa7, 0xdd ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); -DEFINE_GUID(IID_ISnapinHelp2, 0x4861a010, 0x20f9, 0x11d2, 0xa5, 0x10 ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); -DEFINE_GUID(IID_ISnapinProperties, 0xf7889da9, 0x4a02, 0x4837, 0xbf, 0x89 ,0x1a, 0x6f, 0x6f, 0x2a, 0x2, 0x10); -DEFINE_GUID(IID_ISnapinPropertiesCallback, 0xa50fa2e5, 0x7e61, 0x45eb, 0xa8, 0xd4 ,0x9a, 0x7, 0x7, 0xb3, 0xe8, 0x51); -DEFINE_GUID(IID_IStringTable, 0xde40b7a4, 0xf65, 0x11d2, 0x8e, 0x25 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); -DEFINE_GUID(IID_IToolbar, 0x43136eb9, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); -DEFINE_GUID(IID_IViewExtensionCallback, 0x34dd928a, 0x7599, 0x41e5, 0x9f, 0x5e ,0xd6, 0xbc, 0xbc, 0x30, 0x62, 0xc2); -DEFINE_GUID(IID_IWaitCursor, 0x7dfcf9be, 0x9a2b, 0x4e32, 0x9e, 0x3e ,0x96, 0x20, 0x20, 0x66, 0x17, 0xb5); -DEFINE_GUID(IID_IWaitDialog, 0x92b4ff02, 0x8e4, 0x40e5, 0xa5, 0xa6 ,0x62, 0x4f, 0x4f, 0x89, 0x70, 0xc1); -DEFINE_GUID(IID_IWaitDialogCancelCallback, 0xbfd57ccb, 0x78f2, 0x4ab8, 0x91, 0x73 ,0x41, 0x54, 0x54, 0xf, 0x51, 0xa3); -DEFINE_GUID(IID_MenuItem, 0x178fad1, 0xb361, 0x4b27, 0x96, 0xad ,0x67, 0xc5, 0xc5, 0x7e, 0xbf, 0x2e); -DEFINE_GUID(IID_Node, 0xf81ed800, 0x7839, 0x4447, 0x94, 0x5d ,0x8e, 0x15, 0x15, 0xda, 0x59, 0xca); -DEFINE_GUID(IID_Nodes, 0x313b01df, 0xb22f, 0x4d42, 0xb1, 0xb8 ,0x48, 0x3c, 0x3c, 0xdc, 0xf5, 0x1d); -DEFINE_GUID(IID_Properties, 0x2886abc2, 0xa425, 0x42b2, 0x91, 0xc6 ,0xe2, 0x5c, 0x5c, 0xe, 0x4, 0x58); -DEFINE_GUID(IID_Property, 0x4600c3a5, 0xe301, 0x41d8, 0xb6, 0xd0 ,0xef, 0x2e, 0x2e, 0x42, 0x12, 0xe0); -DEFINE_GUID(IID_ScopeNamespace, 0xebbb48dc, 0x1a3b, 0x4d86, 0xb7, 0x86 ,0xc2, 0x1b, 0x1b, 0x28, 0x38, 0x90); -DEFINE_GUID(IID_SnapIn, 0x3be910f6, 0x3459, 0x49c6, 0xa1, 0xbb ,0x41, 0xe6, 0xe6, 0xbe, 0x9d, 0xf3); -DEFINE_GUID(IID_SnapIns, 0x2ef3de1d, 0xb12a, 0x49d1, 0x92, 0xc5 ,0xb, 00, 00, 0x79, 0x87, 0x68); -DEFINE_GUID(IID_View, 0x6efc2da2, 0xb38c, 0x457e, 0x9a, 0xbb ,0xed, 0x2d, 0x2d, 0x18, 0x9b, 0x8c); -DEFINE_GUID(IID_Views, 0xd6b8c29d, 0xa1ff, 0x4d72, 0xaa, 0xb0 ,0xe3, 0x81, 0x81, 0xe9, 0xb9, 0x33); -DEFINE_GUID(IID__AppEvents, 0xde46cbdd, 0x53f5, 0x4635, 0xaf, 0x54 ,0x4f, 0xe7, 0xe7, 0x1e, 0x92, 0x3d); -DEFINE_GUID(IID__Application, 0xa3afb9cc, 0xb653, 0x4741, 0x86, 0xab ,0xf0, 0x47, 0x47, 0xe, 0xc1, 0x38); -DEFINE_GUID(IID__EventConnector, 0xc0bccd30, 0xde44, 0x4528, 0x84, 0x3 ,0xa0, 0x5a, 0x5a, 0x6a, 0x1c, 0xc8); -DEFINE_GUID(LIBID_MMC20, 0x8e80422b, 0xcac4, 0x472b, 0xb2, 0x72 ,0x96, 0x35, 0x35, 0xf1, 0xdf, 0xef); -DEFINE_GUID(LIBID_MMCVersionLib, 0x9eecdd85, 0xb715, 0x4188, 0x8a, 0x72 ,0x61, 0x15, 0x15, 0x9a, 0xbd, 0xb8); +DEFINE_GUID(IID_IMessageView, 0x80f94174, 0xfccc, 0x11d2, 0xb9, 0x91 ,00, 0xc0, 0x4f, 0x8e, 0xcd, 0x78); +DEFINE_GUID(IID_INodeProperties, 0x15bc4d24, 0xa522, 0x4406, 0xaa, 0x55 ,0x7, 0x49, 0x53, 0x7a, 0x68, 0x65); +DEFINE_GUID(IID_IPropertySheetCallback, 0x85de64dd, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0x4f, 0xd8, 0xdb, 0xe6); +DEFINE_GUID(IID_IPropertySheetProvider, 0x85de64de, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0x4f, 0xd8, 0xdb, 0xe6); +DEFINE_GUID(IID_IReportSnapInFailure, 0x1fed3df6, 0x2c3f, 0x461a, 0xba, 0x20 ,0x4b, 0x1d, 0xf6, 0x56, 0x9a, 0x9b); +DEFINE_GUID(IID_IRequiredExtensions, 0x72782d7a, 0xa4a0, 0x11d1, 0xaf, 0xf ,00, 0xc0, 0x4f, 0xb6, 0xdd, 0x2c); +DEFINE_GUID(IID_IResultData, 0x31da5fa0, 0xe0eb, 0x11cf, 0x9f, 0x21 ,00, 0xaa, 00, 0x3c, 0xa9, 0xf6); +DEFINE_GUID(IID_IResultData2, 0xf36e0eb, 0xa7f1, 0x4a81, 0xbe, 0x5a ,0x92, 0x47, 0xf7, 0xde, 0x4b, 0x1b); +DEFINE_GUID(IID_IResultData3, 0xaef53ae7, 0x99ae, 0x48b4, 0xa7, 0x80 ,0x26, 0x81, 0xcf, 0x40, 0x57, 0x30); +DEFINE_GUID(IID_IResultDataCompare, 0xe8315a52, 0x7a1a, 0x11d0, 0xa2, 0xd2 ,00, 0xc0, 0x4f, 0xd9, 0x9, 0xdd); +DEFINE_GUID(IID_IResultDataCompareEx, 0x96933476, 0x251, 0x11d3, 0xae, 0xb0 ,00, 0xc0, 0x4f, 0x8e, 0xcd, 0x78); +DEFINE_GUID(IID_IResultOwnerData, 0x9cb396d8, 0xea83, 0x11d0, 0xae, 0xf1 ,00, 0xc0, 0x4f, 0xb6, 0xdd, 0x2c); +DEFINE_GUID(IID_ISnapInConsoleStatus, 0xfb59d905, 0x555b, 0x4892, 0xac, 0xd1 ,0xbd, 0xb, 0x3d, 0xea, 0x73, 0xc5); +DEFINE_GUID(IID_ISnapInFactory, 0x1546faac, 0x79a6, 0x4403, 0x9f, 0xe2 ,0x86, 0x1b, 0x9c, 0x88, 0x45, 0x93); +DEFINE_GUID(IID_ISnapinAbout, 0x1245208c, 0xa151, 0x11d0, 0xa7, 0xd7 ,00, 0xc0, 0x4f, 0xd9, 0x9, 0xdd); +DEFINE_GUID(IID_ISnapinHelp, 0xa6b15ace, 0xdf59, 0x11d0, 0xa7, 0xdd ,00, 0xc0, 0x4f, 0xd9, 0x9, 0xdd); +DEFINE_GUID(IID_ISnapinHelp2, 0x4861a010, 0x20f9, 0x11d2, 0xa5, 0x10 ,00, 0xc0, 0x4f, 0xb6, 0xdd, 0x2c); +DEFINE_GUID(IID_ISnapinProperties, 0xf7889da9, 0x4a02, 0x4837, 0xbf, 0x89 ,0x1a, 0x6f, 0x2a, 0x2, 0x10, 0x10); +DEFINE_GUID(IID_ISnapinPropertiesCallback, 0xa50fa2e5, 0x7e61, 0x45eb, 0xa8, 0xd4 ,0x9a, 0x7, 0xb3, 0xe8, 0x51, 0xa8); +DEFINE_GUID(IID_IStringTable, 0xde40b7a4, 0xf65, 0x11d2, 0x8e, 0x25 ,00, 0xc0, 0x4f, 0x8e, 0xcd, 0x78); +DEFINE_GUID(IID_IToolbar, 0x43136eb9, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 00, 0xa8, 00, 0x33); +DEFINE_GUID(IID_IViewExtensionCallback, 0x34dd928a, 0x7599, 0x41e5, 0x9f, 0x5e ,0xd6, 0xbc, 0x30, 0x62, 0xc2, 0xda); +DEFINE_GUID(IID_IWaitCursor, 0x7dfcf9be, 0x9a2b, 0x4e32, 0x9e, 0x3e ,0x96, 0x20, 0x66, 0x17, 0xb5, 0xed); +DEFINE_GUID(IID_IWaitDialog, 0x92b4ff02, 0x8e4, 0x40e5, 0xa5, 0xa6 ,0x62, 0x4f, 0x89, 0x70, 0xc1, 0x16); +DEFINE_GUID(IID_IWaitDialogCancelCallback, 0xbfd57ccb, 0x78f2, 0x4ab8, 0x91, 0x73 ,0x41, 0x54, 0xf, 0x51, 0xa3, 0x9d); +DEFINE_GUID(IID_MenuItem, 0x178fad1, 0xb361, 0x4b27, 0x96, 0xad ,0x67, 0xc5, 0x7e, 0xbf, 0x2e, 0x1d); +DEFINE_GUID(IID_Node, 0xf81ed800, 0x7839, 0x4447, 0x94, 0x5d ,0x8e, 0x15, 0xda, 0x59, 0xca, 0x55); +DEFINE_GUID(IID_Nodes, 0x313b01df, 0xb22f, 0x4d42, 0xb1, 0xb8 ,0x48, 0x3c, 0xdc, 0xf5, 0x1d, 0x35); +DEFINE_GUID(IID_Properties, 0x2886abc2, 0xa425, 0x42b2, 0x91, 0xc6 ,0xe2, 0x5c, 0xe, 0x4, 0x58, 0x1c); +DEFINE_GUID(IID_Property, 0x4600c3a5, 0xe301, 0x41d8, 0xb6, 0xd0 ,0xef, 0x2e, 0x42, 0x12, 0xe0, 0xca); +DEFINE_GUID(IID_ScopeNamespace, 0xebbb48dc, 0x1a3b, 0x4d86, 0xb7, 0x86 ,0xc2, 0x1b, 0x28, 0x38, 0x90, 0x12); +DEFINE_GUID(IID_SnapIn, 0x3be910f6, 0x3459, 0x49c6, 0xa1, 0xbb ,0x41, 0xe6, 0xbe, 0x9d, 0xf3, 0xea); +DEFINE_GUID(IID_SnapIns, 0x2ef3de1d, 0xb12a, 0x49d1, 0x92, 0xc5 ,0xb, 00, 0x79, 0x87, 0x68, 0xf1); +DEFINE_GUID(IID_View, 0x6efc2da2, 0xb38c, 0x457e, 0x9a, 0xbb ,0xed, 0x2d, 0x18, 0x9b, 0x8c, 0x38); +DEFINE_GUID(IID_Views, 0xd6b8c29d, 0xa1ff, 0x4d72, 0xaa, 0xb0 ,0xe3, 0x81, 0xe9, 0xb9, 0x33, 0x8d); +DEFINE_GUID(IID__AppEvents, 0xde46cbdd, 0x53f5, 0x4635, 0xaf, 0x54 ,0x4f, 0xe7, 0x1e, 0x92, 0x3d, 0x3f); +DEFINE_GUID(IID__Application, 0xa3afb9cc, 0xb653, 0x4741, 0x86, 0xab ,0xf0, 0x47, 0xe, 0xc1, 0x38, 0x4c); +DEFINE_GUID(IID__EventConnector, 0xc0bccd30, 0xde44, 0x4528, 0x84, 0x3 ,0xa0, 0x5a, 0x6a, 0x1c, 0xc8, 0xea); +DEFINE_GUID(LIBID_MMC20, 0x8e80422b, 0xcac4, 0x472b, 0xb2, 0x72 ,0x96, 0x35, 0xf1, 0xdf, 0xef, 0x3b); +DEFINE_GUID(LIBID_MMCVersionLib, 0x9eecdd85, 0xb715, 0x4188, 0x8a, 0x72 ,0x61, 0x15, 0x9a, 0xbd, 0xb8, 0xc4);

1 0

[akhaldi] 54983: [DDK] * Add fltuser.h
by akhaldi＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: akhaldi Date: Sun Jan 15 20:29:11 2012 New Revision: 54983 URL: http://svn.reactos.org/svn/reactos?rev=54983&view=rev Log: [DDK] * Add fltuser.h Added: trunk/reactos/include/ddk/fltuser.h (with props) Added: trunk/reactos/include/ddk/fltuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltuser.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/fltuser.h (added) +++ trunk/reactos/include/ddk/fltuser.h [iso-8859-1] Sun Jan 15 20:29:11 2012 @@ -1,0 +1,298 @@ +/* + * fltuser.h + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Amine Khaldi (amine.khaldi(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once + +#ifndef __FLTUSER_H__ +#define __FLTUSER_H__ + +#define FLT_MGR_BASELINE (((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (SPVER(NTDDI_VERSION) >= SPVER(NTDDI_WIN2KSP4))) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (SPVER(NTDDI_VERSION) >= SPVER(NTDDI_WINXPSP2))) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (SPVER(NTDDI_VERSION) >= SPVER(NTDDI_WS03SP1))) || \ + (NTDDI_VERSION >= NTDDI_VISTA)) + +#define FLT_MGR_AFTER_XPSP2 (((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (SPVER(NTDDI_VERSION) >= SPVER(NTDDI_WIN2KSP4))) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (SPVER(NTDDI_VERSION) > SPVER(NTDDI_WINXPSP2))) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (SPVER(NTDDI_VERSION) >= SPVER(NTDDI_WS03SP1))) || \ + (NTDDI_VERSION >= NTDDI_VISTA)) + +#define FLT_MGR_LONGHORN (NTDDI_VERSION >= NTDDI_VISTA) +#define FLT_MGR_WIN7 (NTDDI_VERSION >= NTDDI_WIN7) + +#include <fltuserstructures.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#if FLT_MGR_BASELINE + +#if FLT_MGR_LONGHORN +#define FLT_ASSERT(_e) NT_ASSERT(_e) +#define FLT_ASSERTMSG(_m, _e) NT_ASSERTMSG(_m, _e) +#else +#define FLT_ASSERT(_e) ASSERT(_e) +#define FLT_ASSERTMSG(_m, _e) ASSERTMSG(_m, _e) +#endif /* FLT_MGR_LONGHORN */ + +_Must_inspect_result_ +HRESULT +WINAPI +FilterLoad( + _In_ LPCWSTR lpFilterName); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterUnload( + _In_ LPCWSTR lpFilterName); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterCreate( + _In_ LPCWSTR lpFilterName, + _Outptr_ HFILTER *hFilter); + +HRESULT +WINAPI +FilterClose( + _In_ HFILTER hFilter); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceCreate( + _In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName, + _Outptr_ HFILTER_INSTANCE *hInstance); + +HRESULT +WINAPI +FilterInstanceClose( + _In_ HFILTER_INSTANCE hInstance); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterAttach( + _In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName , + _In_opt_ DWORD dwCreatedInstanceNameLength , + _Out_writes_bytes_opt_(dwCreatedInstanceNameLength) LPWSTR lpCreatedInstanceName); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterAttachAtAltitude( + _In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_ LPCWSTR lpAltitude, + _In_opt_ LPCWSTR lpInstanceName , + _In_opt_ DWORD dwCreatedInstanceNameLength , + _Out_writes_bytes_opt_(dwCreatedInstanceNameLength) LPWSTR lpCreatedInstanceName); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterDetach( + _In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindFirst( + _In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpFilterFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindNext( + _In_ HANDLE hFilterFind, + _In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindClose( + _In_ HANDLE hFilterFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeFindFirst( + _In_ FILTER_VOLUME_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ PHANDLE lpVolumeFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeFindNext( + _In_ HANDLE hVolumeFind, + _In_ FILTER_VOLUME_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +HRESULT +WINAPI +FilterVolumeFindClose( + _In_ HANDLE hVolumeFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindFirst( + _In_ LPCWSTR lpFilterName, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpFilterInstanceFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindNext( + _In_ HANDLE hFilterInstanceFind, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindClose( + _In_ HANDLE hFilterInstanceFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeInstanceFindFirst( + _In_ LPCWSTR lpVolumeName, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpVolumeInstanceFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeInstanceFindNext( + _In_ HANDLE hVolumeInstanceFind, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +HRESULT +WINAPI +FilterVolumeInstanceFindClose( + _In_ HANDLE hVolumeInstanceFind); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetInformation( + _In_ HFILTER hFilter, + _In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceGetInformation( + _In_ HFILTER_INSTANCE hInstance, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize,*lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterConnectCommunicationPort( + _In_ LPCWSTR lpPortName, + _In_ DWORD dwOptions, + _In_reads_bytes_opt_(wSizeOfContext) LPCVOID lpContext, + _In_ WORD wSizeOfContext, + _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes , + _Outptr_ HANDLE *hPort); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterSendMessage( + _In_ HANDLE hPort, + _In_reads_bytes_opt_(dwInBufferSize) LPVOID lpInBuffer, + _In_ DWORD dwInBufferSize, + _Out_writes_bytes_to_opt_(dwOutBufferSize,*lpBytesReturned) LPVOID lpOutBuffer, + _In_ DWORD dwOutBufferSize, + _Out_ LPDWORD lpBytesReturned); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetMessage( + _In_ HANDLE hPort, + _Out_writes_bytes_(dwMessageBufferSize) PFILTER_MESSAGE_HEADER lpMessageBuffer, + _In_ DWORD dwMessageBufferSize, + _Inout_ LPOVERLAPPED lpOverlapped); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterReplyMessage( + _In_ HANDLE hPort, + _In_reads_bytes_(dwReplyBufferSize) PFILTER_REPLY_HEADER lpReplyBuffer, + _In_ DWORD dwReplyBufferSize); + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetDosName( + _In_ LPCWSTR lpVolumeName, + _Out_writes_(dwDosNameBufferSize) LPWSTR lpDosName, + _In_ DWORD dwDosNameBufferSize); + +#endif /* FLT_MGR_BASELINE */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __FLTUSER_H__ */ Propchange: trunk/reactos/include/ddk/fltuser.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs