Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dchapyshev] 39302: - Small cleanup shell32. We don't support non-unicode OSes and Windows XP/2003 calls unicode functions
by dchapyshev＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: dchapyshev Date: Tue Feb 3 03:23:16 2009 New Revision: 39302 URL: http://svn.reactos.org/svn/reactos?rev=39302&view=rev Log: - Small cleanup shell32. We don't support non-unicode OSes and Windows XP/2003 calls unicode functions Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellpath.c trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Tue Feb 3 03:23:16 2009 @@ -28,33 +28,33 @@ 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW -31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW # Fixme -32 stdcall -noname PathAddBackslash(ptr) PathAddBackslashAW # Fixme -33 stdcall -noname PathRemoveBlanks(ptr) PathRemoveBlanksAW # Fixme -34 stdcall -noname PathFindFileName(ptr) PathFindFileNameAW # Fixme +31 stdcall -noname PathFindExtension(wstr) PathFindExtensionW +32 stdcall -noname PathAddBackslash(wstr) PathAddBackslashW +33 stdcall -noname PathRemoveBlanks(wstr) PathRemoveBlanksW +34 stdcall -noname PathFindFileName(wstr) PathFindFileNameW 35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme 36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme -37 stdcall -noname PathCombine(ptr ptr ptr) PathCombineAW # Fixme -38 stdcall -noname PathStripPath(ptr) PathStripPathAW # Fixme -39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW # Fixme -40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW # Fixme +37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW +38 stdcall -noname PathStripPath(wstr) PathStripPathW +39 stdcall -noname PathIsUNC(wstr) PathIsUNCW +40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW 41 stdcall IsLFNDriveA(str) 42 stdcall IsLFNDriveW(wstr) 43 stdcall PathIsExe(ptr) PathIsExeAW 44 stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme -46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW # Fixme +46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW -48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW # Fixme +48 stdcall -noname PathSetDlgItemPath(long long wstr) PathSetDlgItemPathW 49 stdcall PathQualify(ptr) PathQualifyAW -50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW # Fixme +50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW 51 stdcall PathResolve(str long long) PathResolveAW -52 stdcall -noname PathGetArgs(str) PathGetArgsAW # Fixme +52 stdcall -noname PathGetArgs(wstr) PathGetArgsW 53 stub -noname Shell_53 54 stub -noname LogoffWindowsDialog -55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW # Fixme -56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW # Fixme -57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW # Fixme +55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW +56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW +57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme 59 stdcall RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) # Fixme @@ -90,8 +90,8 @@ 90 stdcall SHFindFiles(ptr ptr) 91 stub SHFindComputer # Fixme 92 stdcall PathGetShortPath(ptr) PathGetShortPathAW -93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryAW # Fixme -94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW # Fixme +93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW +94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW 95 stdcall -noname SHLogILFromFSIL(ptr) 96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # Fixme 97 stdcall -noname SHWaitForFileToOpen(long long long) @@ -142,7 +142,7 @@ 142 stub DragQueryFileAorW 143 stdcall DragQueryFileW(long long ptr long) 144 stdcall DragQueryPoint(long ptr) -145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW # Fixme +145 stdcall -noname PathFindOnPath(wstr wstr) PathFindOnPathW 146 stdcall -noname RLBuildListOfPaths() 147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW 148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) @@ -155,13 +155,13 @@ 155 stdcall ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW -158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW # Fixme -159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW # Fixme +158 stdcall -noname PathGetExtension(wstr long long) SHPathGetExtensionW +159 stdcall -noname PathIsDirectory(wstr) PathIsDirectoryW 160 stub SHNetConnectionDialog # Fixme 161 stdcall SHRunControlPanel(long long) 162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # Fixme 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # Fixme -164 stdcall Win32DeleteFile(str) Win32DeleteFileAW +164 stdcall Win32DeleteFile(wstr) Win32DeleteFileW 165 stdcall SHCreateDirectory(long ptr) 166 stdcall CallCPLEntry16(long long long long long long) 167 stdcall SHAddFromPropSheetExtArray(long long long) @@ -172,7 +172,7 @@ 172 stdcall -noname SHCreateLinks(long str ptr long ptr) 173 stdcall SHValidateUNC(long long long) 174 stdcall SHCreateShellFolderViewEx(ptr ptr) -175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW # Fixme +175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathW 176 stdcall SHSetInstanceExplorer(long) 177 stub DAD_SetDragImageFromListView 178 stdcall SHObjectProperties(long long wstr wstr) @@ -246,9 +246,9 @@ 246 stub -noname Shell_246 247 stub -noname Shell_247 248 stub -noname Shell_248 # Fixme -249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW # Fixme -250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW # Fixme -251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW # Fixme +249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW +250 stdcall -noname PathRemoveExtension(wstr) PathRemoveExtensionW +251 stdcall -noname PathRemoveArgs(wstr) PathRemoveArgsW 252 stub -noname Shell_252 # Fixme 253 stub -noname Shell_253 254 stub -noname Shell_254 Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Tue Feb 3 03:23:16 2009 @@ -45,29 +45,6 @@ } /************************************************************************* - * PathCombine [SHELL32.37] - */ -LPVOID WINAPI PathCombineAW( - LPVOID szDest, - LPCVOID lpszDir, - LPCVOID lpszFile) -{ - if (SHELL_OsIsUnicode()) - return PathCombineW( szDest, lpszDir, lpszFile ); - return PathCombineA( szDest, lpszDir, lpszFile ); -} - -/************************************************************************* - * PathAddBackslash [SHELL32.32] - */ -LPVOID WINAPI PathAddBackslashAW(LPVOID lpszPath) -{ - if(SHELL_OsIsUnicode()) - return PathAddBackslashW(lpszPath); - return PathAddBackslashA(lpszPath); -} - -/************************************************************************* * PathBuildRoot [SHELL32.30] */ LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive) @@ -77,31 +54,6 @@ return PathBuildRootA(lpszPath, drive); } -/* - Extracting Component Parts -*/ - -/************************************************************************* - * PathFindFileName [SHELL32.34] - */ -LPVOID WINAPI PathFindFileNameAW(LPCVOID lpszPath) -{ - if(SHELL_OsIsUnicode()) - return PathFindFileNameW(lpszPath); - return PathFindFileNameA(lpszPath); -} - -/************************************************************************* - * PathFindExtension [SHELL32.31] - */ -LPVOID WINAPI PathFindExtensionAW(LPCVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathFindExtensionW(lpszPath); - return PathFindExtensionA(lpszPath); - -} - /************************************************************************* * PathGetExtensionA [internal] * @@ -120,7 +72,7 @@ /************************************************************************* * PathGetExtensionW [internal] */ -static LPWSTR PathGetExtensionW(LPCWSTR lpszPath) +LPWSTR PathGetExtensionW(LPCWSTR lpszPath) { TRACE("(%s)\n",debugstr_w(lpszPath)); @@ -129,33 +81,11 @@ } /************************************************************************* - * PathGetExtension [SHELL32.158] - */ -LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath,DWORD void1, DWORD void2) -{ - if (SHELL_OsIsUnicode()) - return PathGetExtensionW(lpszPath); - return PathGetExtensionA(lpszPath); -} - -/************************************************************************* - * PathGetArgs [SHELL32.52] - */ -LPVOID WINAPI PathGetArgsAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathGetArgsW(lpszPath); - return PathGetArgsA(lpszPath); -} - -/************************************************************************* - * PathGetDriveNumber [SHELL32.57] - */ -int WINAPI PathGetDriveNumberAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathGetDriveNumberW(lpszPath); - return PathGetDriveNumberA(lpszPath); + * SHPathGetExtension [SHELL32.158] + */ +LPVOID WINAPI SHPathGetExtensionW(LPCWSTR lpszPath, DWORD void1, DWORD void2) +{ + return PathGetExtensionW(lpszPath); } /************************************************************************* @@ -167,50 +97,6 @@ return PathRemoveFileSpecW(lpszPath); return PathRemoveFileSpecA(lpszPath); } - -/************************************************************************* - * PathStripPath [SHELL32.38] - */ -void WINAPI PathStripPathAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - PathStripPathW(lpszPath); - else - PathStripPathA(lpszPath); -} - -/************************************************************************* - * PathStripToRoot [SHELL32.50] - */ -BOOL WINAPI PathStripToRootAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathStripToRootW(lpszPath); - return PathStripToRootA(lpszPath); -} - -/************************************************************************* - * PathRemoveArgs [SHELL32.251] - */ -void WINAPI PathRemoveArgsAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - PathRemoveArgsW(lpszPath); - else - PathRemoveArgsA(lpszPath); -} - -/************************************************************************* - * PathRemoveExtension [SHELL32.250] - */ -void WINAPI PathRemoveExtensionAW(LPVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - PathRemoveExtensionW(lpszPath); - else - PathRemoveExtensionA(lpszPath); -} - /* Path Manipulations @@ -256,71 +142,9 @@ PathGetShortPathA(pszPath); } -/************************************************************************* - * PathRemoveBlanks [SHELL32.33] - */ -void WINAPI PathRemoveBlanksAW(LPVOID str) -{ - if(SHELL_OsIsUnicode()) - PathRemoveBlanksW(str); - else - PathRemoveBlanksA(str); -} - -/************************************************************************* - * PathQuoteSpaces [SHELL32.55] - */ -VOID WINAPI PathQuoteSpacesAW (LPVOID lpszPath) -{ - if(SHELL_OsIsUnicode()) - PathQuoteSpacesW(lpszPath); - else - PathQuoteSpacesA(lpszPath); -} - -/************************************************************************* - * PathUnquoteSpaces [SHELL32.56] - */ -VOID WINAPI PathUnquoteSpacesAW(LPVOID str) -{ - if(SHELL_OsIsUnicode()) - PathUnquoteSpacesW(str); - else - PathUnquoteSpacesA(str); -} - -/************************************************************************* - * PathParseIconLocation [SHELL32.249] - */ -int WINAPI PathParseIconLocationAW (LPVOID lpszPath) -{ - if(SHELL_OsIsUnicode()) - return PathParseIconLocationW(lpszPath); - return PathParseIconLocationA(lpszPath); -} - /* ########## Path Testing ########## */ -/************************************************************************* - * PathIsUNC [SHELL32.39] - */ -BOOL WINAPI PathIsUNCAW (LPCVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathIsUNCW( lpszPath ); - return PathIsUNCA( lpszPath ); -} - -/************************************************************************* - * PathIsRelative [SHELL32.40] - */ -BOOL WINAPI PathIsRelativeAW (LPCVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathIsRelativeW( lpszPath ); - return PathIsRelativeA( lpszPath ); -} /************************************************************************* * PathIsRoot [SHELL32.29] @@ -381,16 +205,6 @@ } /************************************************************************* - * PathIsDirectory [SHELL32.159] - */ -BOOL WINAPI PathIsDirectoryAW (LPCVOID lpszPath) -{ - if (SHELL_OsIsUnicode()) - return PathIsDirectoryW (lpszPath); - return PathIsDirectoryA (lpszPath); -} - -/************************************************************************* * PathFileExists [SHELL32.45] */ BOOL WINAPI PathFileExistsAW (LPCVOID lpszPath) @@ -398,16 +212,6 @@ if (SHELL_OsIsUnicode()) return PathFileExistsW (lpszPath); return PathFileExistsA (lpszPath); -} - -/************************************************************************* - * PathMatchSpec [SHELL32.46] - */ -BOOL WINAPI PathMatchSpecAW(LPVOID name, LPVOID mask) -{ - if (SHELL_OsIsUnicode()) - return PathMatchSpecW( name, mask ); - return PathMatchSpecA( name, mask ); } /************************************************************************* @@ -525,16 +329,6 @@ /* ########## cleaning and resolving paths ########## */ - -/************************************************************************* - * PathFindOnPath [SHELL32.145] - */ -BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs) -{ - if (SHELL_OsIsUnicode()) - return PathFindOnPathW(sFile, (LPCWSTR *)sOtherDirs); - return PathFindOnPathA(sFile, (LPCSTR *)sOtherDirs); -} /************************************************************************* * PathCleanupSpec [SHELL32.171] @@ -726,17 +520,6 @@ /* ########## special ########## */ - -/************************************************************************* - * PathSetDlgItemPath (SHELL32.48) - */ -VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) -{ - if (SHELL_OsIsUnicode()) - PathSetDlgItemPathW(hDlg, id, pszPath); - else - PathSetDlgItemPathA(hDlg, id, pszPath); -} static const WCHAR szCurrentVersion[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'}; static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; @@ -2249,21 +2032,6 @@ } /************************************************************************* - * SHGetSpecialFolderPath (SHELL32.175) - */ -BOOL WINAPI SHGetSpecialFolderPathAW ( - HWND hwndOwner, - LPVOID szPath, - int nFolder, - BOOL bCreate) - -{ - if (SHELL_OsIsUnicode()) - return SHGetSpecialFolderPathW (hwndOwner, szPath, nFolder, bCreate); - return SHGetSpecialFolderPathA (hwndOwner, szPath, nFolder, bCreate); -} - -/************************************************************************* * SHGetFolderLocation [SHELL32.@] * * Gets the folder locations from the registry and creates a pidl. Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Tue Feb 3 03:23:16 2009 @@ -37,11 +37,8 @@ static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; -static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); -static DWORD SHNotifyRemoveDirectoryA(LPCSTR path); static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path); -static DWORD SHNotifyDeleteFileA(LPCSTR path); static DWORD SHNotifyDeleteFileW(LPCWSTR path); static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest); static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); @@ -367,28 +364,7 @@ * * RETURNS * TRUE if successful, FALSE otherwise - * - * NOTES - * Verified on Win98 / IE 5 (SHELL32 4.72, March 1999 build) to be ANSI. - * This is Unicode on NT/2000 - */ -static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec) -{ - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s, %p)\n", debugstr_a(path), sec); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyCreateDirectoryW(wPath, sec); - SHELL32_FreeUnicodeBuf(wPath); - } - return retCode; -} - -/**********************************************************************/ + */ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -404,11 +380,9 @@ /**********************************************************************/ -BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) -{ - if (SHELL_OsIsUnicode()) - return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); - return (SHNotifyCreateDirectoryA(path, sec) == ERROR_SUCCESS); +BOOL WINAPI Win32CreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec) +{ + return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); } /************************************************************************ @@ -421,29 +395,7 @@ * * RETURNS * TRUE if successful, FALSE otherwise - * - * NOTES - * Verified on Win98 / IE 5 (SHELL32 4.72, March 1999 build) to be ANSI. - * This is Unicode on NT/2000 - */ -static DWORD SHNotifyRemoveDirectoryA(LPCSTR path) -{ - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s)\n", debugstr_a(path)); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyRemoveDirectoryW(wPath); - SHELL32_FreeUnicodeBuf(wPath); - } - return retCode; -} - -/***********************************************************************/ - + */ static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path) { BOOL ret; @@ -468,11 +420,9 @@ /***********************************************************************/ -BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) -{ - if (SHELL_OsIsUnicode()) - return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); - return (SHNotifyRemoveDirectoryA(path) == ERROR_SUCCESS); +BOOL WINAPI Win32RemoveDirectoryW(LPCWSTR path) +{ + return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); } /************************************************************************ @@ -485,29 +435,7 @@ * * RETURNS * TRUE if successful, FALSE otherwise - * - * NOTES - * Verified on Win98 / IE 5 (SHELL32 4.72, March 1999 build) to be ANSI. - * This is Unicode on NT/2000 - */ -static DWORD SHNotifyDeleteFileA(LPCSTR path) -{ - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s)\n", debugstr_a(path)); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyDeleteFileW(wPath); - SHELL32_FreeUnicodeBuf(wPath); - } - return retCode; -} - -/***********************************************************************/ - + */ static DWORD SHNotifyDeleteFileW(LPCWSTR path) { BOOL ret; @@ -533,11 +461,9 @@ /***********************************************************************/ -DWORD WINAPI Win32DeleteFileAW(LPCVOID path) -{ - if (SHELL_OsIsUnicode()) - return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); - return (SHNotifyDeleteFileA(path) == ERROR_SUCCESS); +DWORD WINAPI Win32DeleteFileW(LPCWSTR path) +{ + return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); } /************************************************************************

1 0

[mjmartin] 39301: - Change MultiByteToWideChar to match windows behavior. Fix part 1 of ? for bug #3740.
by mjmartin＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: mjmartin Date: Tue Feb 3 03:09:06 2009 New Revision: 39301 URL: http://svn.reactos.org/svn/reactos?rev=39301&view=rev Log: - Change MultiByteToWideChar to match windows behavior. Fix part 1 of ? for bug #3740. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Tue Feb 3 03:09:06 2009 @@ -523,6 +523,14 @@ if (WideCharCount == 0) return MultiByteCount; + /* Fill the WideCharString buffer with what will fit: Verified on WinXP */ + for (TempLength = (WideCharCount < MultiByteCount) ? WideCharCount : MultiByteCount; + TempLength > 0; + MultiByteString++, TempLength--) + { + *WideCharString++ = CodePageTable->MultiByteTable[(UCHAR)*MultiByteString]; + } + /* Adjust buffer size. Wine trick ;-) */ if (WideCharCount < MultiByteCount) { @@ -530,15 +538,7 @@ SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; } - - for (TempLength = MultiByteCount; - TempLength > 0; - MultiByteString++, TempLength--) - { - *WideCharString++ = CodePageTable->MultiByteTable[(UCHAR)*MultiByteString]; - } - - return MultiByteCount; + return MultiByteCount; } }

1 0

[dchapyshev] 39300: - Update shell32 exports to 6.0.2900.5686
by dchapyshev＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: dchapyshev Date: Tue Feb 3 01:37:10 2009 New Revision: 39300 URL: http://svn.reactos.org/svn/reactos?rev=39300&view=rev Log: - Update shell32 exports to 6.0.2900.5686 Modified: trunk/reactos/dll/win32/shell32/brsfolder.c trunk/reactos/dll/win32/shell32/iconcache.c trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shlmenu.c Modified: trunk/reactos/dll/win32/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.c [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -98,7 +98,7 @@ TRACE("%p\n", info ); - Shell_GetImageList(NULL, &hImageList); + Shell_GetImageLists(NULL, &hImageList); if (hImageList) SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -498,13 +498,13 @@ } /************************************************************************* - * Shell_GetImageList [SHELL32.71] + * Shell_GetImageLists [SHELL32.71] * * PARAMETERS * imglist[1|2] [OUT] pointer which receives imagelist handles * */ -BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) +BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) { TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) { *lpBigList = ShellBigIconList; Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -805,7 +805,7 @@ } /************************************************************************* - * ILAppend [SHELL32.154] + * ILAppendID [SHELL32.154] * * Adds the single ItemID item to the ItemIDList indicated by pidl. * If bEnd is FALSE, inserts the item in the front of the list, Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -1,448 +1,513 @@ -# Functions exported by the Win95 shell32.dll -# (these need to have these exact ordinals, for some -# win95 and winNT dlls import shell32.dll by ordinal) -# This list was updated to dll version 4.72 +# Functions exported by the WinXP SP3 shell32.dll (6.0.2900.5686) +2 stdcall SHChangeNotifyRegister(long long long long long ptr) +3 stdcall SHDefExtractIconA(str long long ptr ptr long) +4 stdcall SHChangeNotifyDeregister(long) +5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) +6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) +7 stub -noname Shell_7 +8 stub -noname Shell_8 +9 stub PifMgr_OpenProperties +10 stub PifMgr_GetProperties +11 stub PifMgr_SetProperties +12 stub -noname Shell_12 +13 stub PifMgr_CloseProperties +14 stub SHStartNetConnectionDialogW +15 stdcall -noname ILGetDisplayName(ptr ptr) +16 stdcall ILFindLastID(ptr) +17 stdcall ILRemoveLastID(ptr) +18 stdcall ILClone(ptr) +19 stdcall ILCloneFirst(ptr) +20 stdcall -noname ILGlobalClone(ptr) +21 stdcall ILIsEqual(ptr ptr) +22 stub DAD_DragEnterEx2 +23 stdcall ILIsParent(ptr ptr long) +24 stdcall ILFindChild(ptr ptr) +25 stdcall ILCombine(ptr ptr) +26 stdcall ILLoadFromStream(ptr ptr) +27 stdcall ILSaveToStream(ptr ptr) +28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW +29 stdcall -noname PathIsRoot(ptr) PathIsRootAW +30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW +31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW # Fixme +32 stdcall -noname PathAddBackslash(ptr) PathAddBackslashAW # Fixme +33 stdcall -noname PathRemoveBlanks(ptr) PathRemoveBlanksAW # Fixme +34 stdcall -noname PathFindFileName(ptr) PathFindFileNameAW # Fixme +35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme +36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme +37 stdcall -noname PathCombine(ptr ptr ptr) PathCombineAW # Fixme +38 stdcall -noname PathStripPath(ptr) PathStripPathAW # Fixme +39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW # Fixme +40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW # Fixme +41 stdcall IsLFNDriveA(str) +42 stdcall IsLFNDriveW(wstr) +43 stdcall PathIsExe(ptr) PathIsExeAW +44 stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA +45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme +46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW # Fixme +47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW +48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW # Fixme +49 stdcall PathQualify(ptr) PathQualifyAW +50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW # Fixme +51 stdcall PathResolve(str long long) PathResolveAW +52 stdcall -noname PathGetArgs(str) PathGetArgsAW # Fixme +53 stub -noname Shell_53 +54 stub -noname LogoffWindowsDialog +55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW # Fixme +56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW # Fixme +57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW # Fixme +58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme +59 stdcall RestartDialog(long wstr long) +60 stdcall -noname ExitWindowsDialog(long) # Fixme +61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlg # Fixme +62 stdcall PickIconDlg(long long long long) +63 stdcall GetFileNameFromBrowse(long long long long str str str) +64 stdcall DriveType(long) +65 stdcall -noname InvalidateDriveType(long) # Fixme +66 stdcall IsNetDrive(long) +67 stdcall Shell_MergeMenus(long long long long long long) +68 stdcall SHGetSetSettings(ptr long long) +69 stub -noname SHGetNetResource # Fixme +70 stdcall -noname SHCreateDefClassObject(long long long long long) +71 stdcall -noname Shell_GetImageLists(ptr ptr) +72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW +73 stdcall SHShellFolderView_Message(long long long) +74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) +75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) +76 stub DragQueryInfo # Fixme +77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) +78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme +79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme +80 stub SHOpenPropSheetW +81 stdcall OpenAs_RunDLLA(long long str long) +82 stub -noname Shell_82 +83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) +84 stub SHIsBadInterfacePtr # Fixme +85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA +86 stdcall -noname SHRegisterDragDrop(long ptr) +87 stdcall -noname SHRevokeDragDrop(long) +88 stdcall SHDoDragDrop(long ptr ptr long ptr) +89 stdcall SHCloneSpecialIDList(long long long) +90 stdcall SHFindFiles(ptr ptr) +91 stub SHFindComputer # Fixme +92 stdcall PathGetShortPath(ptr) PathGetShortPathAW +93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryAW # Fixme +94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW # Fixme +95 stdcall -noname SHLogILFromFSIL(ptr) +96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # Fixme +97 stdcall -noname SHWaitForFileToOpen(long long long) +98 stdcall SHGetRealIDL(ptr ptr ptr) +99 stdcall -noname SetAppStartingCursor(long long) # Fixme +100 stdcall SHRestricted(long) +101 stdcall OpenAs_RunDLLW(long long wstr long) +102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) +103 stdcall SignalFileOpen(long) +104 stub Activate_RunDLL +105 stub AppCompat_RunDLLW +106 stdcall CheckEscapesA(str long) +107 stdcall CheckEscapesW(wstr long) +108 stdcall CommandLineToArgvW(wstr ptr) +109 stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA +110 stdcall Control_FillCache_RunDLLA(long long long long) +111 stdcall Control_FillCache_RunDLLW(long long long long) +112 stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA +113 stdcall Control_RunDLLA(ptr ptr str long) +114 stub Control_RunDLLAsUserW +115 stdcall Control_RunDLLW(ptr ptr wstr long) +116 stdcall DllCanUnloadNow() +117 stdcall DllGetClassObject(ptr ptr ptr) +118 stdcall DllGetVersion(ptr) +119 stdcall IsLFNDrive(ptr) IsLFNDriveAW +120 stdcall DllInstall(long wstr) +121 stdcall SHFlushClipboard() +122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? +123 stdcall -noname SHFreeUnusedLibraries() +124 stdcall DllRegisterServer() +125 stdcall DllUnregisterServer() +126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme +127 stdcall -noname SHWinHelp(long long long long) +128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject +129 stdcall DAD_AutoScroll(long ptr ptr) +130 stdcall -noname DAD_DragEnter(long) +131 stdcall DAD_DragEnterEx(long double) +132 stdcall DAD_DragLeave() +133 stdcall DoEnvironmentSubstA(str str) +134 stdcall DAD_DragMove(double) +135 stdcall DoEnvironmentSubstW(wstr wstr) +136 stdcall DAD_SetDragImage(long long) +137 stdcall DAD_ShowDragImage(long) +138 stdcall DragAcceptFiles(long long) +139 stdcall DragFinish(long) +140 stdcall DragQueryFile(long long ptr long) DragQueryFileA +141 stdcall DragQueryFileA(long long ptr long) +142 stub DragQueryFileAorW +143 stdcall DragQueryFileW(long long ptr long) +144 stdcall DragQueryPoint(long ptr) +145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW # Fixme +146 stdcall -noname RLBuildListOfPaths() +147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW +148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) +149 stdcall SHFind_InitMenuPopup(long long long long) +150 stdcall DuplicateIcon(long long) +151 stdcall SHLoadOLE(long) +152 stdcall ILGetSize(ptr) +153 stdcall ILGetNext(ptr) +154 stdcall -noname ILAppendID(long long long) ILAppend +155 stdcall ILFree(ptr) +156 stdcall -noname ILGlobalFree(ptr) +157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW +158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW # Fixme +159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW # Fixme +160 stub SHNetConnectionDialog # Fixme +161 stdcall SHRunControlPanel(long long) +162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # Fixme +163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # Fixme +164 stdcall Win32DeleteFile(str) Win32DeleteFileAW +165 stdcall SHCreateDirectory(long ptr) +166 stdcall CallCPLEntry16(long long long long long long) +167 stdcall SHAddFromPropSheetExtArray(long long long) +168 stdcall SHCreatePropSheetExtArray(long wstr long) +169 stdcall SHDestroyPropSheetExtArray(long) +170 stdcall SHReplaceFromPropSheetExtArray(long long long long) +171 stdcall PathCleanupSpec(ptr ptr) +172 stdcall -noname SHCreateLinks(long str ptr long ptr) +173 stdcall SHValidateUNC(long long long) +174 stdcall SHCreateShellFolderViewEx(ptr ptr) +175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW # Fixme +176 stdcall SHSetInstanceExplorer(long) +177 stub DAD_SetDragImageFromListView +178 stdcall SHObjectProperties(long long wstr wstr) +179 stdcall SHGetNewLinkInfoA(str str ptr long long) +180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) +181 stdcall -noname RegisterShellHook(long long) +182 varargs ShellMessageBoxA(long long str str long) +183 varargs ShellMessageBoxW(long long wstr wstr long) +184 stdcall -noname ArrangeWindows(long long long long long) # Fixme +185 stub -noname SHHandleDiskFull # Fixme +186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) +187 stub -noname ILGetPseudoNameW # Fixme +188 stdcall -noname ShellDDEInit(long) +189 stdcall ILCreateFromPathA(str) +190 stdcall ILCreateFromPathW(wstr) +191 stdcall SHUpdateImageA(str long long long) +192 stdcall SHUpdateImageW(wstr long long long) +193 stdcall SHHandleUpdateImage(ptr) +194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) +195 stdcall SHFree(ptr) +196 stdcall SHAlloc(long) +197 stub -noname SHGlobalDefect +198 stdcall -noname SHAbortInvokeCommand() +199 stdcall ExtractAssociatedIconA(long str ptr) +200 stub -noname SHLocalAlloc # Fixme +201 stub -noname SHLocalFree # Fixme +202 stub -noname SHLocalReAlloc # Fixme +203 stub -noname AddCommasW # Fixme +204 stub -noname ShortSizeFormatW # Fixme +205 stdcall Printer_LoadIconsW(wstr ptr ptr) +206 stdcall ExtractAssociatedIconExA(long str long long) +207 stdcall ExtractAssociatedIconExW(long wstr long long) +208 stdcall ExtractAssociatedIconW(long wstr ptr) +209 stub -noname Int64ToString # Fixme +210 stub -noname LargeIntegerToString # Fixme +211 stub -noname Printers_GetPidl # Fixme +212 stub -noname Printers_AddPrinterPropPages +213 stdcall -noname Printers_RegisterWindowW(wstr long ptr ptr) +214 stdcall -noname Printers_UnregisterWindow(long long) +215 stdcall -noname SHStartNetConnectionDialog(long str long) +216 stdcall ExtractIconA(long str long) +217 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA +218 stdcall ExtractIconExA(str long ptr ptr long) +219 stdcall ExtractIconExW(wstr long ptr ptr long) +220 stub ExtractIconResInfoA +221 stub ExtractIconResInfoW +222 stdcall ExtractIconW(long wstr long) +223 stub ExtractVersionResource16W +224 stub FindExeDlgProc +225 stdcall FindExecutableA(str str ptr) +226 stdcall FindExecutableW(wstr wstr ptr) +227 stdcall FreeIconList(long) +228 stub InternalExtractIconListA +229 stub InternalExtractIconListW +230 stub -noname Shell_230 +231 stub -noname Shell_231 +232 stub -noname Shell_232 +233 stub -noname Shell_233 +234 stub -noname Shell_234 +235 stub -noname Shell_235 +236 stub -noname Shell_236 +237 stub -noname Shell_237 +238 stdcall Options_RunDLL(ptr ptr str long) +239 stub PathIsSlowW +240 stub PathIsSlowA +241 stub -noname Shell_241 +242 stub -noname Shell_242 +243 stdcall @(long long) shell32_243 # Fixme !!! Call SetShellWindowEx() +244 stdcall -noname SHInitRestricted(ptr ptr) +245 stub SHTestTokenMembership +246 stub -noname Shell_246 +247 stub -noname Shell_247 +248 stub -noname Shell_248 # Fixme +249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW # Fixme +250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW # Fixme +251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW # Fixme +252 stub -noname Shell_252 # Fixme +253 stub -noname Shell_253 +254 stub -noname Shell_254 +255 stdcall Options_RunDLLA(ptr ptr str long) +256 stdcall SHCreateShellFolderView(ptr ptr) SHELL32_256 # Fixme +257 stub -noname Shell_257 # Fixme +258 stdcall -noname LinkWindow_RegisterClass() +259 stdcall -noname LinkWindow_UnregisterClass() +260 stdcall Options_RunDLLW(ptr ptr wstr long) +261 stub PrintersGetCommand_RunDLL +262 stub PrintersGetCommand_RunDLLA +263 stub PrintersGetCommand_RunDLLW +264 stub RealShellExecuteA +265 stub RealShellExecuteExA +266 stub RealShellExecuteExW +267 stub RealShellExecuteW +268 stub RegenerateUserEnvironment +269 stdcall SHAddToRecentDocs(long ptr) +270 stdcall SHAppBarMessage(long ptr) +271 stdcall SHBindToParent(ptr ptr ptr ptr) +272 stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA +273 stdcall SHBrowseForFolderA(ptr) +274 stdcall SHBrowseForFolderW(ptr) +275 stdcall SHChangeNotify(long long ptr ptr) +276 stub SHChangeNotifySuspendResume +277 stdcall SHCreateDirectoryExA(long str ptr) +278 stdcall SHCreateDirectoryExW(long wstr ptr) +279 stub SHCreateLocalServerRunDll +280 stub SHCreateProcessAsUserW +281 stub SHCreateQueryCancelAutoPlayMoniker +282 stdcall SHCreateShellItem(ptr ptr ptr ptr) +283 stdcall SHEmptyRecycleBinA(long str long) +284 stdcall SHEmptyRecycleBinW(long wstr long) +285 stub SHEnableServiceObject +286 stub SHEnumerateUnreadMailAccountsW +287 stub SHExtractIconsW +288 stdcall SHFileOperation(ptr) SHFileOperationA +289 stdcall SHFileOperationA(ptr) +290 stdcall SHFileOperationW(ptr) +291 stdcall SHFormatDrive(long long long long) +292 stdcall SHFreeNameMappings(ptr) +293 stdcall SHGetDataFromIDListA(ptr ptr long ptr long) +294 stdcall SHGetDataFromIDListW(ptr ptr long ptr long) +295 stdcall SHGetDesktopFolder(ptr) +296 stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +297 stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +298 stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +299 stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA +300 stdcall SHGetFileInfoA(ptr long ptr long long) +301 stdcall SHGetFileInfoW(ptr long ptr long long) +302 stdcall SHGetFolderLocation(long long long long ptr) +303 stdcall SHGetFolderPathA(long long long long ptr) +304 stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +305 stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) +306 stdcall SHGetFolderPathW(long long long long ptr) +307 stub SHGetIconOverlayIndexA # Needed for sync with Wine +308 stub SHGetIconOverlayIndexW # Needed for sync with Wine +309 stdcall SHGetInstanceExplorer(long) +310 stdcall SHGetMalloc(ptr) +311 stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +312 stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA +313 stdcall SHGetPathFromIDListA(ptr ptr) +314 stdcall SHGetPathFromIDListW(ptr ptr) +315 stdcall SHGetSettings(ptr long) +316 stdcall SHGetSpecialFolderLocation(long long ptr) +317 stdcall SHGetSpecialFolderPathA(long ptr long long) +318 stdcall SHGetSpecialFolderPathW(long ptr long long) +319 stub SHGetUnreadMailCountW +320 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA +321 stdcall SHHelpShortcuts_RunDLLA(long long long long) +322 stdcall SHHelpShortcuts_RunDLLW(long long long long) +323 stub SHInvokePrinterCommandA +324 stub SHInvokePrinterCommandW +325 stdcall SHIsFileAvailableOffline(wstr ptr) +326 stdcall SHLoadInProc(long) +327 stdcall SHLoadNonloadedIconOverlayIdentifiers() +328 stdcall SHOpenFolderAndSelectItems(ptr long ptr long) +329 stdcall SHParseDisplayName(wstr ptr ptr long ptr) +330 stdcall SHPathPrepareForWriteA(long ptr str long) +331 stdcall SHPathPrepareForWriteW(long ptr wstr long) +332 stdcall SHQueryRecycleBinA(str ptr) +333 stdcall SHQueryRecycleBinW(wstr ptr) +334 stdcall SHSetLocalizedName(wstr wstr long) +335 stub SHSetUnreadMailCountW +336 stdcall SHUpdateRecycleBinIcon() +337 stdcall SheChangeDirA(str) +338 stub SheChangeDirExA +339 stub SheChangeDirExW +340 stdcall SheChangeDirW(wstr) +341 stub SheConvertPathW +342 stub SheFullPathA +343 stub SheFullPathW +344 stub SheGetCurDrive +345 stdcall SheGetDirA(long long) +346 stub SheGetDirExW +347 stdcall SheGetDirW(long long) +348 stub SheGetPathOffsetW +349 stub SheRemoveQuotesA +350 stub SheRemoveQuotesW +351 stub SheSetCurDrive +352 stub SheShortenPathA +353 stub SheShortenPathW +354 stdcall ShellAboutA(long str str long) +355 stdcall ShellAboutW(long wstr wstr long) +356 stub ShellExec_RunDLL +357 stub ShellExec_RunDLLA +358 stub ShellExec_RunDLLW +359 stdcall ShellExecuteA(long str str str str long) +360 stdcall ShellExecuteEx(long) ShellExecuteExA +361 stdcall ShellExecuteExA (long) +362 stdcall ShellExecuteExW (long) +363 stdcall ShellExecuteW(long wstr wstr wstr wstr long) +364 stub ShellHookProc +365 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA +366 stdcall Shell_NotifyIconA(long ptr) +367 stdcall Shell_NotifyIconW(long ptr) +368 stdcall StrChrA(str long) shlwapi.StrChrA +369 stdcall StrChrIA(str long) shlwapi.StrChrIA +370 stdcall StrChrIW(wstr long) shlwapi.StrChrIW +371 stdcall StrChrW(wstr long) shlwapi.StrChrW +372 stdcall StrCmpNA(str str long) shlwapi.StrCmpNA +373 stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA +374 stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW +375 stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW +376 stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA +377 stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +378 stdcall StrNCmpA(str str long) shlwapi.StrCmpNA +379 stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA +380 stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW +381 stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW +382 stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA +383 stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +384 stdcall StrRChrA(str str long) shlwapi.StrRChrA +385 stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +386 stdcall StrRChrIW(str str long) shlwapi.StrRChrIW +387 stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW +388 stub StrRStrA +389 stdcall StrRStrIA(str str str) shlwapi.StrRStrIA +390 stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW +391 stub StrRStrW +392 stdcall StrStrA(str str) shlwapi.StrStrA +393 stdcall StrStrIA(str str) shlwapi.StrStrIA +394 stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW +395 stdcall StrStrW(wstr wstr) shlwapi.StrStrW +396 stub WOWShellExecute +520 stdcall SHAllocShared(ptr long long) +521 stdcall SHLockShared(long long) +522 stdcall SHUnlockShared(ptr) +523 stdcall SHFreeShared(long long) +524 stdcall RealDriveType(long long) +525 stub -noname RealDriveTypeFlags +526 stdcall SHFlushSFCache() +640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) +641 stdcall -noname NTSHChangeNotifyDeregister(long) +643 stub -noname SHChangeNotifyReceive # Fixme +644 stdcall SHChangeNotification_Lock(long long ptr ptr) +645 stdcall SHChangeNotification_Unlock(long) +646 stub -noname SHChangeRegistrationReceive # Fixme +648 stub -noname SHWaitOp_Operate +650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW # Fixme +651 stdcall -noname SHReadCabinetState(long long) ReadCabinetState # Fixme +652 stdcall WriteCabinetState(long) +653 stdcall PathProcessCommand(long long long long) PathProcessCommandAW +654 stdcall ReadCabinetState(long long) +660 stdcall -noname FileIconInit(long) +680 stdcall IsUserAnAdmin() +681 stub -noname Shell_681 +683 stub -noname Shell_683 +684 stub -noname Shell_684 +685 stub SHPropStgCreate +688 stub SHPropStgReadMultiple +689 stub SHPropStgWriteMultiple +690 stub -noname Shell_690 +691 stub -noname Shell_691 +700 stub CDefFolderMenu_Create +701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) +702 stub -noname Shell_702 +703 stub -noname Shell_703 # Fixme +704 stdcall -noname GUIDFromStringW(wstr ptr) # Fixme +707 stub -noname Shell_707 # Fixme +708 stub -noname Shell_708 +709 stub SHGetSetFolderCustomSettingsW +711 stub -noname Shell_711 +712 stub -noname Shell_712 # Fixme +713 stub -noname Shell_713 +714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW # Fixme +715 stub -noname Shell_715 # Fixme +716 stub SHMultiFileProperties +719 stub -noname Shell_719 +720 stub -noname Shell_720 +721 stub -noname Shell_721 +722 stub -noname Shell_722 +723 stub -noname Shell_723 +724 stub -noname Shell_724 +725 stub -noname Shell_725 +726 stub -noname Shell_726 +727 stdcall SHGetImageList(long ptr ptr) +730 stdcall RestartDialogEx(long wstr long long) +731 stub -noname Shell_731 +732 stub -noname Shell_732 +733 stub -noname Shell_733 +740 stub -noname Shell_740 +743 stub SHCreateFileExtractIconW +744 stub -noname Shell_744 +745 stub -noname Shell_745 +747 stub SHLimitInputEdit +748 stub -noname Shell_748 # Fixme +749 stub SHGetShellStyleHInstance +750 stub SHGetAttributesFromDataObject +751 stub -noname Shell_751 +752 stub -noname Shell_752 +753 stub -noname Shell_753 +754 stub -noname Shell_754 +755 stub -noname Shell_755 +756 stub -noname Shell_756 - 2 stdcall SHChangeNotifyRegister(long long long long long ptr) - 3 stdcall SHDefExtractIconA(str long long ptr ptr long) - 4 stdcall SHChangeNotifyDeregister(long) - 5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) - 6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) - 9 stub PifMgr_OpenProperties - 10 stub PifMgr_GetProperties - 11 stub PifMgr_SetProperties - 13 stub PifMgr_CloseProperties - 15 stdcall -noname ILGetDisplayName(ptr ptr) - 16 stdcall ILFindLastID(ptr) - 17 stdcall ILRemoveLastID(ptr) - 18 stdcall ILClone(ptr) - 19 stdcall ILCloneFirst(ptr) - 20 stdcall -noname ILGlobalClone(ptr) - 21 stdcall ILIsEqual(ptr ptr) - 23 stdcall ILIsParent(ptr ptr long) - 24 stdcall ILFindChild(ptr ptr) - 25 stdcall ILCombine(ptr ptr) - 26 stdcall ILLoadFromStream(ptr ptr) - 27 stdcall ILSaveToStream(ptr ptr) - 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW - 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW - 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW - 31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW - 32 stdcall -noname PathAddBackslash(ptr) PathAddBackslashAW - 33 stdcall -noname PathRemoveBlanks(ptr) PathRemoveBlanksAW - 34 stdcall -noname PathFindFileName(ptr) PathFindFileNameAW - 35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW - 36 stdcall -noname PathAppend(ptr ptr) PathAppendAW - 37 stdcall -noname PathCombine(ptr ptr ptr) PathCombineAW - 38 stdcall -noname PathStripPath(ptr)PathStripPathAW - 39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW - 40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW - 41 stdcall IsLFNDriveA(str) - 42 stdcall IsLFNDriveW(wstr) - 43 stdcall PathIsExe(ptr) PathIsExeAW - 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW - 46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW - 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr)PathMakeUniqueNameAW - 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW - 49 stdcall PathQualify(ptr) PathQualifyAW - 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW - 51 stdcall PathResolve(str long long) PathResolveAW - 52 stdcall -noname PathGetArgs(str) PathGetArgsAW - 53 stdcall -noname DoEnvironmentSubst(long long) DoEnvironmentSubstAW - 54 stdcall -noname LogoffWindowsDialog(ptr) - 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW - 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW - 57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW - 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW - 59 stdcall RestartDialog(long wstr long) - 60 stdcall -noname ExitWindowsDialog(long) - 61 stdcall -noname RunFileDlg(long long long str str long) - 62 stdcall PickIconDlg(long long long long) - 63 stdcall GetFileNameFromBrowse(long long long long str str str) - 64 stdcall DriveType(long) - 65 stdcall -noname InvalidateDriveType(long) - 66 stdcall IsNetDrive(long) - 67 stdcall Shell_MergeMenus(long long long long long long) - 68 stdcall SHGetSetSettings(ptr long long) - 69 stub -noname SHGetNetResource - 70 stdcall -noname SHCreateDefClassObject(long long long long long) - 71 stdcall Shell_GetImageList(ptr ptr) - 72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW - 73 stdcall SHShellFolderView_Message(long long long) - 74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) - 75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) - 76 stub -noname DragQueryInfo - 77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) - 78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW - 79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW - 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) - 84 stub -noname SHIsBadInterfacePtr - 85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA - 86 stdcall -noname SHRegisterDragDrop(long ptr) - 87 stdcall -noname SHRevokeDragDrop(long) - 88 stdcall SHDoDragDrop(long ptr ptr long ptr) - 89 stdcall SHCloneSpecialIDList(long long long) - 90 stdcall SHFindFiles(ptr ptr) - 91 stub -noname SHFindComputer - 92 stdcall PathGetShortPath(ptr) PathGetShortPathAW - 93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryAW - 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW - 95 stdcall -noname SHLogILFromFSIL(ptr) - 96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW - 97 stdcall -noname SHWaitForFileToOpen (long long long) - 98 stdcall SHGetRealIDL(ptr ptr ptr) - 99 stdcall -noname SetAppStartingCursor(long long) - 100 stdcall -noname SHRestricted(long) - - 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) - 103 stdcall SignalFileOpen(long) - 104 stdcall -noname FileMenu_DeleteAllItems(long) - 105 stdcall -noname FileMenu_DrawItem(long ptr) - 106 stdcall -noname FileMenu_FindSubMenuByPidl(long ptr) - 107 stdcall -noname FileMenu_GetLastSelectedItemPidls(long ptr ptr) - 108 stdcall -noname FileMenu_HandleMenuChar(long long) - 109 stdcall -noname FileMenu_InitMenuPopup(long) - 110 stdcall -noname FileMenu_InsertUsingPidl (long long ptr long long ptr) - 111 stdcall -noname FileMenu_Invalidate(long) - 112 stdcall -noname FileMenu_MeasureItem(long ptr) - 113 stdcall -noname FileMenu_ReplaceUsingPidl(long long ptr long ptr) - 114 stdcall -noname FileMenu_Create(long long long long long) - 115 stdcall -noname FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW - 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long long) - 117 stdcall -noname FileMenu_DeleteItemByCmd(long long) - 118 stdcall -noname FileMenu_Destroy(long) - 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW - 120 stdcall -noname FileMenu_AbortInitMenu() - 121 stdcall SHFlushClipboard() - 122 stdcall -noname RunDLL_CallEntry16(long long long str long) #name wrong? - 123 stdcall -noname SHFreeUnusedLibraries() - 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) - 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) - 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) - 127 stdcall -noname SHWinHelp(long long long long) - 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject - 129 stdcall DAD_AutoScroll(long ptr ptr) - 130 stdcall -noname DAD_DragEnter(long) - 131 stdcall DAD_DragEnterEx(long double) - 132 stdcall DAD_DragLeave() - 134 stdcall DAD_DragMove(double) - 136 stdcall DAD_SetDragImage(long long) - 137 stdcall DAD_ShowDragImage(long) - 139 stub Desktop_UpdateBriefcaseOnEvent - 140 stdcall -noname FileMenu_DeleteItemByIndex(long long) - 141 stdcall -noname FileMenu_DeleteItemByFirstID(long long) - 142 stdcall -noname FileMenu_DeleteSeparator(long) - 143 stdcall -noname FileMenu_EnableItemByCmd(long long long) - 144 stdcall -noname FileMenu_GetItemExtent(long long) - 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW - 146 stdcall -noname RLBuildListOfPaths() - 147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW - 148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) - 149 stdcall SHFind_InitMenuPopup(long long long long) - - 151 stdcall SHLoadOLE(long) - 152 stdcall ILGetSize(ptr) - 153 stdcall ILGetNext(ptr) - 154 stdcall ILAppend(long long long) - 155 stdcall ILFree(ptr) - 156 stdcall -noname ILGlobalFree(ptr) - 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW - 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW - 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW - 160 stub -noname SHNetConnectionDialog - 161 stdcall SHRunControlPanel(long long) - 162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW - 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW - 164 stdcall Win32DeleteFile(str) Win32DeleteFileAW - 165 stdcall SHCreateDirectory(long ptr) - 166 stdcall CallCPLEntry16(long long long long long long) - 167 stdcall SHAddFromPropSheetExtArray(long long long) - 168 stdcall SHCreatePropSheetExtArray(long wstr long) - 169 stdcall SHDestroyPropSheetExtArray(long) - 170 stdcall SHReplaceFromPropSheetExtArray(long long long long) - 171 stdcall PathCleanupSpec(ptr ptr) - 172 stdcall -noname SHCreateLinks(long str ptr long ptr) - 173 stdcall SHValidateUNC(long long long) - 174 stdcall SHCreateShellFolderViewEx(ptr ptr) - 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW - 176 stdcall SHSetInstanceExplorer(long) - 177 stub -noname DAD_SetDragImageFromListView - 178 stdcall SHObjectProperties(long long wstr wstr) - 179 stdcall SHGetNewLinkInfoA(str str ptr long long) - 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) - 181 stdcall -noname RegisterShellHook(long long) - 182 varargs ShellMessageBoxW(long long wstr wstr long) - 183 varargs ShellMessageBoxA(long long str str long) - 184 stdcall -noname ArrangeWindows(long long long long long) - 185 stub -noname SHHandleDiskFull - 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) - 187 stub -noname ILGetPseudoNameW - 188 stdcall -noname ShellDDEInit(long) - 189 stdcall ILCreateFromPathA(str) - 190 stdcall ILCreateFromPathW(wstr) - 191 stdcall SHUpdateImageA(str long long long) - 192 stdcall SHUpdateImageW(wstr long long long) - 193 stdcall SHHandleUpdateImage(ptr) - 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) - 195 stdcall SHFree(ptr) - 196 stdcall SHAlloc(long) - 197 stub -noname SHGlobalDefect - 198 stdcall -noname SHAbortInvokeCommand() - 199 stub SHGetFileIcon - 200 stdcall SHCreateDesktop(ptr) - 201 stdcall SHDesktopMessageLoop(ptr) - 202 stub SHLocalReAlloc - 203 stub AddCommasW - 204 stub ShortSizeFormatW - 205 stdcall Printer_LoadIconsW(wstr ptr ptr) - 206 stub Link_AddExtraDataSection - 207 stub Link_ReadExtraDataSection - 208 stub Link_RemoveExtraDataSection - 209 stub Int64ToString - 210 stub LargeIntegerToString - 211 stub Printers_GetPidl - 212 stub Printers_AddPrinterPropPages - 213 stdcall Printers_RegisterWindowW(wstr long ptr ptr) - 214 stdcall Printers_UnregisterWindow(long long) - 215 stdcall -noname SHStartNetConnectionDialog(long str long) - 238 stdcall Options_RunDLL(ptr ptr str long) - 243 stdcall @(long long) shell32_243 - 244 stdcall -noname SHInitRestricted(ptr ptr) - 249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW - 250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW - 251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW - 255 stdcall Options_RunDLLA(ptr ptr str long) - 256 stdcall @(ptr ptr) SHELL32_256 - 258 stdcall -noname LinkWindow_RegisterClass() - 259 stdcall -noname LinkWindow_UnregisterClass() - 260 stdcall Options_RunDLLW(ptr ptr wstr long) -#299 stub Shl1632_ThunkData32 -#300 stub Shl3216_ThunkData32 - - 505 stdcall SHRegCloseKey (long) - 506 stdcall SHRegOpenKeyA (long str long) - 507 stdcall SHRegOpenKeyW (long wstr long) - 508 stdcall SHRegQueryValueA(long str ptr ptr) - 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) - 510 stdcall SHRegQueryValueW (long long long long) - 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) - 512 stdcall SHRegDeleteKeyW (long wstr) - - 520 stdcall SHAllocShared(ptr long long) - 521 stdcall SHLockShared(long long) - 522 stdcall SHUnlockShared(ptr) - 523 stdcall SHFreeShared(long long) - 524 stdcall RealDriveType(long long) - 525 stub RealDriveTypeFlags - 526 stdcall SHFlushSFCache() - - 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) - 641 stdcall -noname NTSHChangeNotifyDeregister(long) - - 643 stub SHChangeNotifyReceive - 644 stdcall SHChangeNotification_Lock(long long ptr ptr) - 645 stdcall SHChangeNotification_Unlock(long) - 646 stub SHChangeRegistrationReceive - 647 stub ReceiveAddToRecentDocs - 648 stub SHWaitOp_Operate - - 650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW - - 651 stdcall -noname ReadCabinetState(long long) # OldReadCabinetState - 652 stdcall WriteCabinetState(long) - 653 stdcall PathProcessCommand(long long long long) PathProcessCommandAW - 654 stdcall @(long long) shell32_654 # ReadCabinetState@8 - - 660 stdcall -noname FileIconInit(long) - 680 stdcall IsUserAnAdmin() - 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) - 704 stdcall -noname GUIDFromStringW(wstr ptr) - - 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW - 727 stdcall SHGetImageList(long ptr ptr) - 730 stdcall RestartDialogEx(long wstr long long) - -1217 stub FOOBAR1217 # no joke! This is the real name!! - -@ stdcall CheckEscapesA(str long) -@ stdcall CheckEscapesW(wstr long) -@ stdcall CommandLineToArgvW(wstr ptr) -@ stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA -@ stdcall Control_FillCache_RunDLLA(long long long long) -@ stdcall Control_FillCache_RunDLLW(long long long long) -@ stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA -@ stdcall Control_RunDLLA(ptr ptr str long) -@ stub Control_RunDLLAsUserW -@ stdcall Control_RunDLLW(ptr ptr wstr long) -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() -@ stdcall DoEnvironmentSubstA(str str) -@ stdcall DoEnvironmentSubstW(wstr wstr) -@ stdcall DragAcceptFiles(long long) -@ stdcall DragFinish(long) -@ stdcall DragQueryFile(long long ptr long) DragQueryFileA -@ stdcall DragQueryFileA(long long ptr long) -@ stub DragQueryFileAorW -@ stdcall DragQueryFileW(long long ptr long) -@ stdcall DragQueryPoint(long ptr) -@ stdcall DuplicateIcon(long long) -@ stdcall ExtractAssociatedIconA(long str ptr) -@ stdcall ExtractAssociatedIconExA(long str long long) -@ stdcall ExtractAssociatedIconExW(long wstr long long) -@ stdcall ExtractAssociatedIconW(long wstr ptr) -@ stdcall ExtractIconA(long str long) -@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA -@ stdcall ExtractIconExA(str long ptr ptr long) -@ stdcall ExtractIconExW(wstr long ptr ptr long) -@ stub ExtractIconResInfoA -@ stub ExtractIconResInfoW -@ stdcall ExtractIconW(long wstr long) -@ stub ExtractVersionResource16W -@ stub FindExeDlgProc -@ stdcall FindExecutableA(str str ptr) -@ stdcall FindExecutableW(wstr wstr ptr) -@ stub FixupOptionalComponents -@ stdcall FreeIconList(long) -@ stub InternalExtractIconListA -@ stub InternalExtractIconListW -@ stub OCInstall -@ stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA -@ stdcall OpenAs_RunDLLA(long long str long) -@ stdcall OpenAs_RunDLLW(long long wstr long) -@ stub PrintersGetCommand_RunDLL -@ stub PrintersGetCommand_RunDLLA -@ stub PrintersGetCommand_RunDLLW -@ stub RealShellExecuteA -@ stub RealShellExecuteExA -@ stub RealShellExecuteExW -@ stub RealShellExecuteW -@ stub RegenerateUserEnvironment -@ stdcall SHAddToRecentDocs (long ptr) -@ stdcall SHAppBarMessage(long ptr) -@ stdcall SHBindToParent(ptr ptr ptr ptr) -@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA -@ stdcall SHBrowseForFolderA(ptr) -@ stdcall SHBrowseForFolderW(ptr) -@ stdcall SHChangeNotify (long long ptr ptr) -@ stub SHChangeNotifySuspendResume +# Functions exported by the WinVista shell32.dll @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDefaultExtractIcon(ptr ptr) -@ stdcall SHCreateDirectoryExA(long str ptr) -@ stdcall SHCreateDirectoryExW(long wstr ptr) -@ stub SHCreateProcessAsUserW -@ stdcall SHCreateShellItem(ptr ptr ptr ptr) -@ stdcall SHEmptyRecycleBinA(long str long) -@ stdcall SHEmptyRecycleBinW(long wstr long) -@ stub SHExtractIconsW -@ stdcall SHFileOperation(ptr) SHFileOperationA -@ stdcall SHFileOperationA(ptr) -@ stdcall SHFileOperationW(ptr) -@ stdcall SHFormatDrive(long long long long) -@ stdcall SHFreeNameMappings(ptr) -@ stdcall SHGetDataFromIDListA(ptr ptr long ptr long) -@ stdcall SHGetDataFromIDListW(ptr ptr long ptr long) -@ stdcall SHGetDesktopFolder(ptr) -@ stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -@ stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -@ stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW -@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA -@ stdcall SHGetFileInfoA(ptr long ptr long long) -@ stdcall SHGetFileInfoW(ptr long ptr long long) -@ stdcall SHGetFolderLocation(long long long long ptr) -@ stdcall SHGetFolderPathA(long long long long ptr) -@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) -@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) -@ stdcall SHGetFolderPathW(long long long long ptr) -@ stub SHGetFreeDiskSpace -@ stub SHGetIconOverlayIndexA -@ stub SHGetIconOverlayIndexW -@ stdcall SHGetInstanceExplorer(long) -@ stdcall SHGetMalloc(ptr) -@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA -@ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA -@ stdcall SHGetPathFromIDListA(ptr ptr) -@ stdcall SHGetPathFromIDListW(ptr ptr) -@ stdcall SHGetSettings(ptr long) -@ stdcall SHGetSpecialFolderLocation(long long ptr) -@ stdcall SHGetSpecialFolderPathA(long ptr long long) -@ stdcall SHGetSpecialFolderPathW(long ptr long long) -@ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA -@ stdcall SHHelpShortcuts_RunDLLA(long long long long) -@ stdcall SHHelpShortcuts_RunDLLW(long long long long) -@ stub SHInvokePrinterCommandA -@ stub SHInvokePrinterCommandW -@ stdcall SHIsFileAvailableOffline(wstr ptr) -@ stdcall SHLoadInProc(long) -@ stdcall SHLoadNonloadedIconOverlayIdentifiers() -@ stdcall SHPathPrepareForWriteA(long ptr str long) -@ stdcall SHPathPrepareForWriteW(long ptr wstr long) -@ stdcall SHQueryRecycleBinA(str ptr) -@ stdcall SHQueryRecycleBinW(wstr ptr) -@ stdcall SHSetLocalizedName(wstr wstr long) -@ stdcall SHUpdateRecycleBinIcon() -@ stdcall SheChangeDirA(str) -@ stub SheChangeDirExA -@ stub SheChangeDirExW -@ stdcall SheChangeDirW(wstr) -@ stub SheConvertPathW -@ stub SheFullPathA -@ stub SheFullPathW -@ stub SheGetCurDrive -@ stdcall SheGetDirA(long long) -@ stub SheGetDirExW -@ stdcall SheGetDirW (long long) -@ stub SheGetPathOffsetW -@ stub SheRemoveQuotesA -@ stub SheRemoveQuotesW -@ stub SheSetCurDrive -@ stub SheShortenPathA -@ stub SheShortenPathW -@ stdcall ShellAboutA(long str str long) -@ stdcall ShellAboutW(long wstr wstr long) -@ stub ShellExec_RunDLL -@ stub ShellExec_RunDLLA -@ stub ShellExec_RunDLLW -@ stdcall ShellExecuteA(long str str str str long) -@ stdcall ShellExecuteEx (long) ShellExecuteExA -@ stdcall ShellExecuteExA (long) -@ stdcall ShellExecuteExW (long) -@ stdcall ShellExecuteW (long wstr wstr wstr wstr long) -@ stub ShellHookProc -@ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA -@ stdcall Shell_NotifyIconA(long ptr) -@ stdcall Shell_NotifyIconW(long ptr) -@ stdcall StrChrA(str long) shlwapi.StrChrA -@ stdcall StrChrIA(str long) shlwapi.StrChrIA -@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW -@ stdcall StrChrW(wstr long) shlwapi.StrChrW -@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW -@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW -@ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW -@ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA -@ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW -@ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW -@ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW -@ stdcall StrRChrA(str str long) shlwapi.StrRChrA -@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -@ stdcall StrRChrIW(str str long) shlwapi.StrRChrIW -@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW -@ stub StrRStrA -@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA -@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -@ stub StrRStrW -@ stdcall StrStrA(str str) shlwapi.StrStrA -@ stdcall StrStrIA(str str) shlwapi.StrStrIA -@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW -@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW -@ stub WOWShellExecute -@ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) -@ stdcall SHParseDisplayName(wstr ptr ptr long ptr) + +# Unknown functions. They need to be removed +#@ stdcall FileMenu_DeleteAllItems(long) +#@ stdcall FileMenu_DrawItem(long ptr) +#@ stdcall FileMenu_FindSubMenuByPidl(long ptr) +#@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr) +#@ stdcall FileMenu_HandleMenuChar(long long) +#@ stdcall FileMenu_InitMenuPopup(long) +#@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr) +#@ stdcall FileMenu_Invalidate(long) +#@ stdcall FileMenu_MeasureItem(long ptr) +#@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr) +#@ stdcall FileMenu_Create(long long long long long) +#@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW +#@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long) +#@ stdcall FileMenu_DeleteItemByCmd(long long) +#@ stdcall FileMenu_Destroy(long) +#@ stdcall FileMenu_AbortInitMenu() +#@ stdcall FileMenu_AppendFilesForPidl(long ptr long) +#@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr) +#@ stdcall FileMenu_DeleteItemByIndex(long long) +#@ stdcall FileMenu_DeleteItemByFirstID(long long) +#@ stdcall FileMenu_DeleteSeparator(long) +#@ stdcall FileMenu_EnableItemByCmd(long long long) +#@ stdcall FileMenu_GetItemExtent(long long) +#@ stdcall SHRegCloseKey (long) +#@ stdcall SHRegOpenKeyA (long str long) +#@ stdcall SHRegOpenKeyW (long wstr long) +#@ stdcall SHRegQueryValueA(long str ptr ptr) +#@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) +#@ stdcall SHRegQueryValueW (long long long long) +#@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) +#@ stdcall SHRegDeleteKeyW (long wstr) +#@ stub Desktop_UpdateBriefcaseOnEvent +#@ stub SHGetFileIcon +#@ stub Link_AddExtraDataSection +#@ stub Link_ReadExtraDataSection +#@ stub Link_RemoveExtraDataSection +#@ stub ReceiveAddToRecentDocs +#@ stub FOOBAR1217 # no joke! This is the real name!! +#@ stub FixupOptionalComponents +#@ stub OCInstall +#@ stub SHGetFreeDiskSpace Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -49,7 +49,7 @@ extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellBigIconList; -BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); +BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); /* Iconcache */ #define INVALID_INDEX -1 Modified: trunk/reactos/dll/win32/shell32/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] Tue Feb 3 01:37:10 2009 @@ -613,7 +613,7 @@ ExtTextOutW (lpdis->hDC, xt , yt, ETO_OPAQUE, &TextRect, pMyItem->szItemText, pMyItem->cchItemText, NULL); - Shell_GetImageList(0, &hImageList); + Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom);

1 0

[tkreuzer] 39299: #if out x86 specific inline code for other archictectures
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Mon Feb 2 21:51:40 2009 New Revision: 39299 URL: http://svn.reactos.org/svn/reactos?rev=39299&view=rev Log: #if out x86 specific inline code for other archictectures Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Mon Feb 2 21:51:40 2009 @@ -52,6 +52,7 @@ #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 +#ifdef _M_X86 static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); @@ -64,6 +65,7 @@ __writefsdword(0, (unsigned long)frame->Next); return frame->Next; } +#endif #define __TRY _SEH2_TRY #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation()))

1 0

[tkreuzer] 39298: #if out x86 specific inline code for other archictectures
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Mon Feb 2 21:51:15 2009 New Revision: 39298 URL: http://svn.reactos.org/svn/reactos?rev=39298&view=rev Log: #if out x86 specific inline code for other archictectures Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/exception.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/exception.h [iso-8859-1] Mon Feb 2 21:51:15 2009 @@ -54,6 +54,7 @@ #define EXCEPTION_VM86_STI 0x80000111 #define EXCEPTION_VM86_PICRETURN 0x80000112 +#ifdef _M_X86 static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { frame->Prev = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); @@ -68,6 +69,7 @@ } extern void __wine_enter_vm86( CONTEXT *context ); +#endif #ifdef __cplusplus }

1 0

[tkreuzer] 39297: kd64: Add KdpSysGetVersion to internal header
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Mon Feb 2 19:08:26 2009 New Revision: 39297 URL: http://svn.reactos.org/svn/reactos?rev=39297&view=rev Log: kd64: Add KdpSysGetVersion to internal header Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Mon Feb 2 19:08:26 2009 @@ -257,6 +257,11 @@ IN PCONTEXT ContextRecord, IN KPROCESSOR_MODE PreviousMode, IN BOOLEAN SecondChanceException); + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version); + // // Global KD Data

1 0

[tkreuzer] 39296: Fix LDR_DATA_TABLE_ENTRY member names
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Mon Feb 2 19:07:37 2009 New Revision: 39296 URL: http://svn.reactos.org/svn/reactos?rev=39296&view=rev Log: Fix LDR_DATA_TABLE_ENTRY member names Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Feb 2 19:07:37 2009 @@ -99,8 +99,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY { LIST_ENTRY InLoadOrderLinks; - LIST_ENTRY InMemoryOrderModuleList; - LIST_ENTRY InInitializationOrderModuleList; + LIST_ENTRY InMemoryOrderLinks; + LIST_ENTRY InInitializationOrderLinks; PVOID DllBase; PVOID EntryPoint; ULONG SizeOfImage;

1 0

[cfinck] 39295: Set the APPDATA environment variable when logging in based on the information SHGetFolderPathW returns for the passed User Token. Windows seems to do this the same way (verified with GNU strings)
by cfinck＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cfinck Date: Mon Feb 2 17:08:51 2009 New Revision: 39295 URL: http://svn.reactos.org/svn/reactos?rev=39295&view=rev Log: Set the APPDATA environment variable when logging in based on the information SHGetFolderPathW returns for the passed User Token. Windows seems to do this the same way (verified with GNU strings) Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Feb 2 17:08:51 2009 @@ -175,6 +175,9 @@ SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; + UNICODE_STRING VariableName; + UNICODE_STRING VariableValue; + WCHAR AppDataPath[MAX_PATH]; /* Loading personal settings */ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); @@ -218,6 +221,18 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } + + /* Use SHGetFolderPathW for getting the AppData path */ + if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL) + { + WARN("WL: SHGetFolderPathW() failed\n"); + goto cleanup; + } + + /* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */ + RtlInitUnicodeString(&VariableName, L"APPDATA"); + RtlInitUnicodeString(&VariableValue, AppDataPath); + RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue); if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) { @@ -263,6 +278,8 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); + + /* FIXME: Set the "Volatile Environment" key for the new user */ /* Set default language */ if (!SetDefaultLanguage(TRUE)) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Mon Feb 2 17:08:51 2009 @@ -39,6 +39,7 @@ #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> +#include <shlobj.h> #include <reactos/winlogon.h> Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Mon Feb 2 17:08:51 2009 @@ -9,6 +9,7 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> + <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file>

1 0

[cfinck] 39294: Support passing a Token to SHGetFolderPathW and similar functions
by cfinck＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cfinck Date: Mon Feb 2 17:06:33 2009 New Revision: 39294 URL: http://svn.reactos.org/svn/reactos?rev=39294&view=rev Log: Support passing a Token to SHGetFolderPathW and similar functions Modified: trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Mon Feb 2 17:06:33 2009 @@ -45,7 +45,7 @@ #include <ndk/ntndk.h> #include <fmifs/fmifs.h> #include <largeint.h> - +#include <sddl.h> #include "base/shell/explorer-new/todo.h" #include "dlgs.h" Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Mon Feb 2 17:06:33 2009 @@ -1355,47 +1355,75 @@ if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; + if (CSIDL_Data[folder].type != CSIDL_Type_User) return E_INVALIDARG; + if (!pszPath) return E_INVALIDARG; - /* Only the current user and the default user are supported right now - * I'm afraid. - * FIXME: should be able to call GetTokenInformation on the token, - * then call ConvertSidToStringSidW on it to get the user prefix. - * But Wine's registry doesn't store user info by sid, it stores it - * by user name (and I don't know how to convert from a token to a - * user name). - */ - if (hToken != NULL && hToken != (HANDLE)-1) - { - FIXME("unsupported for user other than current or default\n"); - return E_FAIL; - } - if (dwFlags & SHGFP_TYPE_DEFAULT) + { hr = _SHGetDefaultValue(folder, pszPath); + } else { - LPCWSTR userPrefix = NULL; + LPWSTR userPrefix; HKEY hRootKey; if (hToken == (HANDLE)-1) { + /* Get the folder of the default user */ hRootKey = HKEY_USERS; - userPrefix = DefaultW; - } - else /* hToken == NULL, other values disallowed above */ + userPrefix = (LPWSTR)DefaultW; + } + else if(!hToken) + { + /* Get the folder of the current user */ hRootKey = HKEY_CURRENT_USER; - hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, - CSIDL_Data[folder].szValueName, pszPath); + userPrefix = NULL; + } + else + { + /* Get the folder of the specified user */ + DWORD InfoLength; + PTOKEN_USER UserInfo; + + hRootKey = HKEY_USERS; + + GetTokenInformation(hToken, TokenUser, NULL, 0, &InfoLength); + UserInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, InfoLength); + + if(!GetTokenInformation(hToken, TokenUser, UserInfo, InfoLength, &InfoLength)) + { + WARN("GetTokenInformation failed for %x!\n", hToken); + HeapFree(GetProcessHeap(), 0, UserInfo); + return E_FAIL; + } + + if(!ConvertSidToStringSidW(UserInfo->User.Sid, &userPrefix)) + { + WARN("ConvertSidToStringSidW failed for %x!\n", hToken); + HeapFree(GetProcessHeap(), 0, UserInfo); + return E_FAIL; + } + + HeapFree(GetProcessHeap(), 0, UserInfo); + } + + hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, CSIDL_Data[folder].szValueName, pszPath); + + /* Free the memory allocated by ConvertSidToStringSidW */ + if(!hToken && hToken != (HANDLE)-1) + LocalFree(userPrefix); + if (FAILED(hr) && hRootKey != HKEY_LOCAL_MACHINE) - hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, - CSIDL_Data[folder].szValueName, pszPath); + hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, CSIDL_Data[folder].szValueName, pszPath); + if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); } + TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; }

1 0

[cgutman] 39293: - Release the cancel spin lock before queuing the work item
by cgutman＠svn.reactos.org 02 Feb '09

02 Feb '09

Author: cgutman Date: Mon Feb 2 16:36:26 2009 New Revision: 39293 URL: http://svn.reactos.org/svn/reactos?rev=39293&view=rev Log: - Release the cancel spin lock before queuing the work item Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Feb 2 16:36:26 2009 @@ -181,11 +181,11 @@ TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); + IoReleaseCancelSpinLock(Irp->CancelIrql); + if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); - - IoReleaseCancelSpinLock(Irp->CancelIrql); return; case TDI_SEND_DATAGRAM:

1 0

← Newer
1
...
49
50
51
52
53
54
55
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009