Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 54310: [KERNEL32]: The ANSI/OEM stubs were never initialized... it's a miracle this ever worked, probably because someone added a #define to at least one of them to hack it into working. Init...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 04:13:21 2011 New Revision: 54310 URL: http://svn.reactos.org/svn/reactos?rev=54310&view=rev Log: [KERNEL32]: The ANSI/OEM stubs were never initialized... it's a miracle this ever worked, probably because someone added a #define to at least one of them to hack it into working. Initialize the value snow, fixes boot. Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Sun Nov 6 04:13:21 2011 @@ -20,6 +20,10 @@ /* GLOBALS ******************************************************************/ BOOL bIsFileApiAnsi = TRUE; // set the file api to ansi or oem +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; +PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString = RtlUnicodeStringToAnsiString; +PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize = BasepUnicodeStringToAnsiSize; +PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize = BasepAnsiStringToUnicodeSize; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Nov 6 04:13:21 2011 @@ -20,11 +20,6 @@ #include <debug.h> /* GLOBALS ********************************************************************/ - -PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; -PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; -PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; -PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; UNICODE_STRING Restricted = RTL_CONSTANT_STRING(L"Restricted"); 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] Sun Nov 6 04:13:21 2011 @@ -245,6 +245,13 @@ typedef ULONG (NTAPI *PRTL_COUNT_STRINGA)(IN PANSI_STRING UnicodeString); +ULONG +NTAPI +BasepUnicodeStringToAnsiSize(IN PUNICODE_STRING String); + +ULONG +NTAPI +BasepAnsiStringToUnicodeSize(IN PANSI_STRING String); extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; extern PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString;

1 0

[ion] 54309: [KERNEL32]: Move path-related APIs away from dir.c, and into path.c instead. [KERNEL32]: Fix SetDllDirectoryW: - Fail if "; " is in path - Use RtlCreateUnicodeString instead of manual s...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 02:00:56 2011 New Revision: 54309 URL: http://svn.reactos.org/svn/reactos?rev=54309&view=rev Log: [KERNEL32]: Move path-related APIs away from dir.c, and into path.c instead. [KERNEL32]: Fix SetDllDirectoryW: - Fail if ";" is in path - Use RtlCreateUnicodeString instead of manual string management -- if the allocation fails, do not free the current base directory string! Older API would always free the current directory string, even if setting up the new one failed. - Don't assume lpPathName is filled out, it can be NULL, and this means the DLL directory should be cleared. [KERNEL32]: Fix SetDllDirectoryA as above, additionally use RtlInitAnsiStringEx to protect against overflow, and use Basep8BitStringToUnicodeString, to add support for OEM paths instead of assuming ANSI. [KERNEL32]: GetDllDirectoryW: correctly NULL-terminate and check lengths [KERNEL32]: GetDllDirectoryA: same as above, plus use BasepUnicodeString* APIs to correctly support OEM paths instead of assuming ANSI. [KERNEL32]: NeedCurrentDirectoryForExePath(A/W): call internal BasepIsCurDirAllowedForPlainExeNames instead of converting from A->W, this isn't needed. [KERNEL32]: GetFullPathNameW just calls RtlGetFullPathName_U, no extra checks/etc are needed. Next steps are GetFullPathNameA, GetShort/LongPathNameA, GetShort/LongPathNameW, hoping to bring the wine test failures closer to zero. Added: trunk/reactos/dll/win32/kernel32/client/path.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/dir.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -20,6 +20,7 @@ client/heapmem.c client/job.c client/loader.c + client/path.c client/perfcnt.c client/power.c client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -19,8 +19,6 @@ #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); - -UNICODE_STRING BaseDllDirectory = {0, 0, NULL}; /* FUNCTIONS *****************************************************************/ @@ -578,799 +576,4 @@ return TRUE; } - -/* - * @implemented - */ -DWORD -WINAPI -GetFullPathNameA ( - LPCSTR lpFileName, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - WCHAR BufferW[MAX_PATH]; - PWCHAR FileNameW; - DWORD ret; - LPWSTR FilePartW = NULL; - - TRACE("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return 0; - - ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); - - if (ret < nBufferLength && lpFilePart) - { - /* if the path closed with '\', FilePart is NULL */ - if (!FilePartW) - *lpFilePart=NULL; - else - *lpFilePart = (FilePartW - BufferW) + lpBuffer; - } - - TRACE("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", - lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); - - return ret; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetFullPathNameW ( - LPCWSTR lpFileName, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart - ) -{ - ULONG Length; - - TRACE("GetFullPathNameW(lpFileName %S, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - - Length = RtlGetFullPathName_U ((LPWSTR)lpFileName, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart); - - TRACE("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", - lpBuffer, (lpFilePart == NULL) ? L"NULL" : *lpFilePart, Length / sizeof(WCHAR)); - - if (!lpFileName) - { -#if (WINVER >= _WIN32_WINNT_WIN7) - SetLastError(ERROR_INVALID_PARAMETER); -#endif - return 0; - } - - return Length/sizeof(WCHAR); -} - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameA ( - LPCSTR longpath, - LPSTR shortpath, - DWORD shortlen - ) -{ - PWCHAR LongPathW; - WCHAR ShortPathW[MAX_PATH]; - DWORD ret; - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(LongPathW = FilenameA2W(longpath, FALSE))) - return 0; - - ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); -} - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameW ( - LPCWSTR longpath, - LPWSTR shortpath, - DWORD shortlen - ) -{ - WCHAR tmpshortpath[MAX_PATH]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - WIN32_FIND_DATAW wfd; - HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; - - TRACE("GetShortPathNameW: %S\n",longpath); - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!longpath[0]) - { - SetLastError(ERROR_BAD_PATHNAME); - return 0; - } - - /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) - { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; - } - - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - - while (longpath[lp]) - { - /* check for path delimiters and reproduce them */ - if (longpath[lp] == '\\' || longpath[lp] == '/') - { - if (!sp || tmpshortpath[sp-1] != '\\') - { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; - sp++; - } - tmpshortpath[sp] = 0; /* terminate string */ - lp++; - continue; - } - - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) - { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = (USHORT)tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } - } - - /* Check if the file exists and use the existing short file name */ - goit = FindFirstFileW(tmpshortpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) goto notfound; - FindClose(goit); - lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); - sp += lstrlenW(tmpshortpath + sp); - lp += tmplen; - } - tmpshortpath[sp] = 0; - - tmplen = lstrlenW(tmpshortpath) + 1; - if (tmplen <= shortlen) - { - lstrcpyW(shortpath, tmpshortpath); - tmplen--; /* length without 0 */ - } - - return tmplen; - - notfound: - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; -} - - -/* - * @implemented - */ -DWORD -WINAPI -SearchPathA ( - LPCSTR lpPath, - LPCSTR lpFileName, - LPCSTR lpExtension, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - UNICODE_STRING PathU = { 0, 0, NULL }; - UNICODE_STRING FileNameU = { 0, 0, NULL }; - UNICODE_STRING ExtensionU = { 0, 0, NULL }; - UNICODE_STRING BufferU = { 0, 0, NULL }; - ANSI_STRING Path; - ANSI_STRING FileName; - ANSI_STRING Extension; - ANSI_STRING Buffer; - PWCHAR FilePartW; - DWORD RetValue = 0; - NTSTATUS Status = STATUS_SUCCESS; - - if (!lpFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - RtlInitAnsiString (&Path, - (LPSTR)lpPath); - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - RtlInitAnsiString (&Extension, - (LPSTR)lpExtension); - - /* convert ansi (or oem) strings to unicode */ - if (bIsFileApiAnsi) - { - Status = RtlAnsiStringToUnicodeString (&PathU, - &Path, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - } - else - { - Status = RtlOemStringToUnicodeString (&PathU, - &Path, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - Status = RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlOemStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - } - - BufferU.MaximumLength = min(nBufferLength * sizeof(WCHAR), USHRT_MAX); - BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - BufferU.MaximumLength); - if (BufferU.Buffer == NULL) - { - Status = STATUS_NO_MEMORY; - goto Cleanup; - } - - Buffer.MaximumLength = min(nBufferLength, USHRT_MAX); - Buffer.Buffer = lpBuffer; - - RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer, - NULL == lpFileName ? NULL : FileNameU.Buffer, - NULL == lpExtension ? NULL : ExtensionU.Buffer, - nBufferLength, - BufferU.Buffer, - &FilePartW); - - if (0 != RetValue) - { - BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - Status = RtlUnicodeStringToAnsiString(&Buffer, - &BufferU, - FALSE); - else - Status = RtlUnicodeStringToOemString(&Buffer, - &BufferU, - FALSE); - - if (NT_SUCCESS(Status) && Buffer.Buffer) - { - /* nul-terminate ascii string */ - Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; - - if (NULL != lpFilePart && BufferU.Length != 0) - { - *lpFilePart = strrchr (lpBuffer, '\\') + 1; - } - } - } - -Cleanup: - RtlFreeHeap (RtlGetProcessHeap (), - 0, - PathU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - ExtensionU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - BufferU.Buffer); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return RetValue; -} - - -/*********************************************************************** - * ContainsPath (Wine name: contains_pathW) - * - * Check if the file name contains a path; helper for SearchPathW. - * A relative path is not considered a path unless it starts with ./ or ../ - */ -static -BOOL -ContainsPath(LPCWSTR name) -{ - if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; - if (name[0] != '.') return FALSE; - if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE; - return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); -} - - -/* - * @implemented - */ -DWORD -WINAPI -SearchPathW(LPCWSTR lpPath, - LPCWSTR lpFileName, - LPCWSTR lpExtension, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart) -{ - DWORD ret = 0; - - if (!lpFileName || !lpFileName[0]) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - /* If the name contains an explicit path, ignore the path */ - if (ContainsPath(lpFileName)) - { - /* try first without extension */ - if (RtlDoesFileExists_U(lpFileName)) - return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); - - if (lpExtension) - { - LPCWSTR p = wcsrchr(lpFileName, '.'); - if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) - lpExtension = NULL; /* Ignore the specified extension */ - } - - /* Allocate a buffer for the file name and extension */ - if (lpExtension) - { - LPWSTR tmp; - DWORD len = wcslen(lpFileName) + wcslen(lpExtension); - - if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - wcscpy(tmp, lpFileName); - wcscat(tmp, lpExtension); - if (RtlDoesFileExists_U(tmp)) - ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); - RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); - } - } - else if (lpPath && lpPath[0]) /* search in the specified path */ - { - ret = RtlDosSearchPath_U(lpPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - } - else /* search in the default path */ - { - WCHAR *DllPath = GetDllLoadPath(NULL); - - if (DllPath) - { - ret = RtlDosSearchPath_U(DllPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); - } - else - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - } - - if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); - - return ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -SetDllDirectoryW( - LPCWSTR lpPathName - ) -{ - UNICODE_STRING PathName; - - RtlInitUnicodeString(&PathName, lpPathName); - - RtlEnterCriticalSection(&BaseDllDirectoryLock); - if(PathName.Length > 0) - { - if(PathName.Length + sizeof(WCHAR) <= BaseDllDirectory.MaximumLength) - { - RtlCopyUnicodeString(&BaseDllDirectory, &PathName); - } - else - { - RtlFreeUnicodeString(&BaseDllDirectory); - if(!(BaseDllDirectory.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - PathName.Length + sizeof(WCHAR)))) - { - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - BaseDllDirectory.Length = 0; - BaseDllDirectory.MaximumLength = PathName.Length + sizeof(WCHAR); - - RtlCopyUnicodeString(&BaseDllDirectory, &PathName); - } - } - else - { - RtlFreeUnicodeString(&BaseDllDirectory); - } - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -SetDllDirectoryA( - LPCSTR lpPathName /* can be NULL */ - ) -{ - PWCHAR PathNameW=NULL; - - if(lpPathName) - { - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return FALSE; - } - - return SetDllDirectoryW(PathNameW); -} - -/* - * @implemented - */ -DWORD -WINAPI -GetDllDirectoryW( - DWORD nBufferLength, - LPWSTR lpBuffer - ) -{ - DWORD Ret; - - RtlEnterCriticalSection(&BaseDllDirectoryLock); - if(nBufferLength > 0) - { - Ret = BaseDllDirectory.Length / sizeof(WCHAR); - if(Ret > nBufferLength - 1) - { - Ret = nBufferLength - 1; - } - - if(Ret > 0) - { - RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, Ret * sizeof(WCHAR)); - } - lpBuffer[Ret] = L'\0'; - } - else - { - /* include termination character, even if the string is empty! */ - Ret = (BaseDllDirectory.Length / sizeof(WCHAR)) + 1; - } - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - return Ret; -} - -/* - * @implemented - */ -DWORD -WINAPI -GetDllDirectoryA( - DWORD nBufferLength, - LPSTR lpBuffer - ) -{ - WCHAR BufferW[MAX_PATH]; - DWORD ret; - - ret = GetDllDirectoryW(MAX_PATH, BufferW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); -} - - -/* - * @implemented - */ -BOOL WINAPI -NeedCurrentDirectoryForExePathW(LPCWSTR ExeName) -{ - static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t', - 'C','u','r','r','e','n','t', - 'D','i','r','e','c','t','o','r','y', - 'I','n','E','x','e','P','a','t','h',0}; - WCHAR env_val; - - /* MSDN mentions some 'registry location'. We do not use registry. */ - FIXME("(%s): partial stub\n", debugstr_w(ExeName)); - - if (wcschr(ExeName, L'\\')) - return TRUE; - - /* Check the existence of the variable, not value */ - if (!GetEnvironmentVariableW( env_name, &env_val, 1 )) - return TRUE; - - return FALSE; -} - - -/* - * @implemented - */ -BOOL WINAPI -NeedCurrentDirectoryForExePathA(LPCSTR ExeName) -{ - WCHAR *ExeNameW; - - if (!(ExeNameW = FilenameA2W(ExeName, FALSE))) - return TRUE; - - return NeedCurrentDirectoryForExePathW(ExeNameW); -} - - - - - -/*********************************************************************** - * @implemented - * - * GetLongPathNameW (KERNEL32.@) - * - * NOTES - * observed (Win2000): - * shortpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0 - * shortpath="": LastError=ERROR_PATH_NOT_FOUND, ret=0 - */ -DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) -{ -#define MAX_PATHNAME_LEN 1024 - - WCHAR tmplongpath[MAX_PATHNAME_LEN]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - BOOL unixabsolute; - WIN32_FIND_DATAW wfd; - HANDLE goit; - - if (!shortpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!shortpath[0]) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return 0; - } - - TRACE("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); - - if (shortpath[0] == '\\' && shortpath[1] == '\\') - { - WARN("ERR: UNC pathname %s\n", shortpath); - lstrcpynW( longpath, shortpath, longlen ); - return wcslen(longpath); - } - unixabsolute = (shortpath[0] == '/'); - /* check for drive letter */ - if (!unixabsolute && shortpath[1] == ':' ) - { - tmplongpath[0] = shortpath[0]; - tmplongpath[1] = ':'; - lp = sp = 2; - } - - while (shortpath[sp]) - { - /* check for path delimiters and reproduce them */ - if (shortpath[sp] == '\\' || shortpath[sp] == '/') - { - if (!lp || tmplongpath[lp-1] != '\\') - { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; - } - tmplongpath[lp] = 0; /* terminate string */ - sp++; - continue; - } - - p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - } - for (; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (shortpath + sp); - lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); - /* Check if the file exists and use the existing file name */ - goit = FindFirstFileW(tmplongpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) - { - TRACE("not found %s!\n", tmplongpath); - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; - } - FindClose(goit); - wcscpy(tmplongpath + lp, wfd.cFileName); - lp += wcslen(tmplongpath + lp); - sp += tmplen; - } - tmplen = wcslen(shortpath) - 1; - if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && - (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) - tmplongpath[lp++] = shortpath[tmplen]; - tmplongpath[lp] = 0; - - tmplen = wcslen(tmplongpath) + 1; - if (tmplen <= longlen) - { - wcscpy(longpath, tmplongpath); - TRACE("returning %s\n", longpath); - tmplen--; /* length without 0 */ - } - - return tmplen; -} - - - -/*********************************************************************** - * GetLongPathNameA (KERNEL32.@) - */ -DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) -{ - WCHAR *shortpathW; - WCHAR longpathW[MAX_PATH]; - DWORD ret; - - TRACE("GetLongPathNameA %s, %i\n",shortpath,longlen ); - - if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) - return 0; - - ret = GetLongPathNameW(shortpathW, longpathW, MAX_PATH); - - if (!ret) return 0; - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(longpath, longlen, longpathW, ret+1 ); -} - /* EOF */ Added: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c (added) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -1,0 +1,817 @@ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/client/path.c + * PURPOSE: Handles path APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +UNICODE_STRING BaseDllDirectory; +UNICODE_STRING NoDefaultCurrentDirectoryInExePath = RTL_CONSTANT_STRING(L"NoDefaultCurrentDirectoryInExePath"); + +/* FUNCTIONS ******************************************************************/ + +BOOL +WINAPI +BasepIsCurDirAllowedForPlainExeNames(VOID) +{ + NTSTATUS Status; + UNICODE_STRING EmptyString; + + RtlInitEmptyUnicodeString(&EmptyString, NULL, 0); + Status = RtlQueryEnvironmentVariable_U(0, + &NoDefaultCurrentDirectoryInExePath, + &EmptyString); + return NT_SUCCESS(Status); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetDllDirectoryW(IN LPCWSTR lpPathName) +{ + UNICODE_STRING OldDirectory, DllDirectory; + + if (lpPathName) + { + if (wcschr(lpPathName, ';')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!RtlCreateUnicodeString(&DllDirectory, lpPathName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + RtlInitUnicodeString(&DllDirectory, 0); + } + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + OldDirectory = BaseDllDirectory; + BaseDllDirectory = DllDirectory; + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + RtlFreeUnicodeString(&OldDirectory); + return 1; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetDllDirectoryA(IN LPCSTR lpPathName) +{ + ANSI_STRING AnsiDllDirectory; + UNICODE_STRING OldDirectory, DllDirectory; + NTSTATUS Status; + + if (lpPathName) + { + if (strchr(lpPathName, ';')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlInitAnsiStringEx(&AnsiDllDirectory, lpPathName); + if (NT_SUCCESS(Status)) + { + Status = Basep8BitStringToUnicodeString(&DllDirectory, + &AnsiDllDirectory, + TRUE); + } + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + } + else + { + RtlInitUnicodeString(&DllDirectory, 0); + } + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + OldDirectory = BaseDllDirectory; + BaseDllDirectory = DllDirectory; + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + RtlFreeUnicodeString(&OldDirectory); + return 1; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetDllDirectoryW(IN DWORD nBufferLength, + OUT LPWSTR lpBuffer) +{ + ULONG Length; + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + if ((nBufferLength * sizeof(WCHAR)) > BaseDllDirectory.Length) + { + RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, BaseDllDirectory.Length); + Length = BaseDllDirectory.Length / sizeof(WCHAR); + lpBuffer[Length] = UNICODE_NULL; + } + else + { + Length = (BaseDllDirectory.Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + if (lpBuffer) *lpBuffer = UNICODE_NULL; + } + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + return Length; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetDllDirectoryA(IN DWORD nBufferLength, + OUT LPSTR lpBuffer) +{ + NTSTATUS Status; + ANSI_STRING AnsiDllDirectory; + ULONG Length; + + RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, 0); + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + Length = BasepUnicodeStringTo8BitSize(&BaseDllDirectory); + if (Length > nBufferLength) + { + Status = STATUS_SUCCESS; + if (lpBuffer) *lpBuffer = ANSI_NULL; + } + else + { + --Length; + Status = BasepUnicodeStringTo8BitString(&AnsiDllDirectory, + &BaseDllDirectory, + FALSE); + } + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Length = 0; + if (lpBuffer) *lpBuffer = ANSI_NULL; + } + + return Length; +} + +/* + * @implemented + */ +BOOL +WINAPI +NeedCurrentDirectoryForExePathW(IN LPCWSTR ExeName) +{ + if (wcschr(ExeName, '\\')) return TRUE; + + return BasepIsCurDirAllowedForPlainExeNames(); +} + +/* + * @implemented + */ +BOOL +WINAPI +NeedCurrentDirectoryForExePathA(IN LPCSTR ExeName) +{ + if (strchr(ExeName, '\\')) return TRUE; + + return BasepIsCurDirAllowedForPlainExeNames(); +} + +/* + * @implemented + */ +DWORD +WINAPI +GetFullPathNameA ( + LPCSTR lpFileName, + DWORD nBufferLength, + LPSTR lpBuffer, + LPSTR *lpFilePart + ) +{ + WCHAR BufferW[MAX_PATH]; + PWCHAR FileNameW; + DWORD ret; + LPWSTR FilePartW = NULL; + + DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " + "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); + + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + return 0; + + ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); + + if (!ret) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); + + if (ret < nBufferLength && lpFilePart) + { + /* if the path closed with '\', FilePart is NULL */ + if (!FilePartW) + *lpFilePart=NULL; + else + *lpFilePart = (FilePartW - BufferW) + lpBuffer; + } + + DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", + lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); + + return ret; +} + + +/* + * @implemented + */ +DWORD +WINAPI +GetFullPathNameW(IN LPCWSTR lpFileName, + IN DWORD nBufferLength, + IN LPWSTR lpBuffer, + OUT LPWSTR *lpFilePart) +{ + return RtlGetFullPathName_U((LPWSTR)lpFileName, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); +} + + +/* + * NOTE: Copied from Wine. + * @implemented + */ +DWORD +WINAPI +GetShortPathNameA ( + LPCSTR longpath, + LPSTR shortpath, + DWORD shortlen + ) +{ + PWCHAR LongPathW; + WCHAR ShortPathW[MAX_PATH]; + DWORD ret; + + if (!longpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(LongPathW = FilenameA2W(longpath, FALSE))) + return 0; + + ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); + + if (!ret) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); +} + + +/* + * NOTE: Copied from Wine. + * @implemented + */ +DWORD +WINAPI +GetShortPathNameW ( + LPCWSTR longpath, + LPWSTR shortpath, + DWORD shortlen + ) +{ + WCHAR tmpshortpath[MAX_PATH]; + LPCWSTR p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + WIN32_FIND_DATAW wfd; + HANDLE goit; + UNICODE_STRING ustr; + WCHAR ustr_buf[8+1+3+1]; + + DPRINT("GetShortPathNameW: %S\n",longpath); + + if (!longpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!longpath[0]) + { + SetLastError(ERROR_BAD_PATHNAME); + return 0; + } + + /* check for drive letter */ + if (longpath[0] != '/' && longpath[1] == ':' ) + { + tmpshortpath[0] = longpath[0]; + tmpshortpath[1] = ':'; + sp = lp = 2; + } + + ustr.Buffer = ustr_buf; + ustr.Length = 0; + ustr.MaximumLength = sizeof(ustr_buf); + + while (longpath[lp]) + { + /* check for path delimiters and reproduce them */ + if (longpath[lp] == '\\' || longpath[lp] == '/') + { + if (!sp || tmpshortpath[sp-1] != '\\') + { + /* strip double "\\" */ + tmpshortpath[sp] = '\\'; + sp++; + } + tmpshortpath[sp] = 0; /* terminate string */ + lp++; + continue; + } + + for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + /* Check, if the current element is a valid dos name */ + if (tmplen <= 8+1+3) + { + BOOLEAN spaces; + memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); + ustr_buf[tmplen] = '\0'; + ustr.Length = (USHORT)tmplen * sizeof(WCHAR); + if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + + /* Check if the file exists and use the existing short file name */ + goit = FindFirstFileW(tmpshortpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) goto notfound; + FindClose(goit); + lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + sp += lstrlenW(tmpshortpath + sp); + lp += tmplen; + } + tmpshortpath[sp] = 0; + + tmplen = lstrlenW(tmpshortpath) + 1; + if (tmplen <= shortlen) + { + lstrcpyW(shortpath, tmpshortpath); + tmplen--; /* length without 0 */ + } + + return tmplen; + + notfound: + SetLastError ( ERROR_FILE_NOT_FOUND ); + return 0; +} + + +/* + * @implemented + */ +DWORD +WINAPI +SearchPathA ( + LPCSTR lpPath, + LPCSTR lpFileName, + LPCSTR lpExtension, + DWORD nBufferLength, + LPSTR lpBuffer, + LPSTR *lpFilePart + ) +{ + UNICODE_STRING PathU = { 0, 0, NULL }; + UNICODE_STRING FileNameU = { 0, 0, NULL }; + UNICODE_STRING ExtensionU = { 0, 0, NULL }; + UNICODE_STRING BufferU = { 0, 0, NULL }; + ANSI_STRING Path; + ANSI_STRING FileName; + ANSI_STRING Extension; + ANSI_STRING Buffer; + PWCHAR FilePartW; + DWORD RetValue = 0; + NTSTATUS Status = STATUS_SUCCESS; + + if (!lpFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + RtlInitAnsiString (&Path, + (LPSTR)lpPath); + RtlInitAnsiString (&FileName, + (LPSTR)lpFileName); + RtlInitAnsiString (&Extension, + (LPSTR)lpExtension); + + /* convert ansi (or oem) strings to unicode */ + if (bIsFileApiAnsi) + { + Status = RtlAnsiStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + } + else + { + Status = RtlOemStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + Status = RtlOemStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlOemStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + } + + BufferU.MaximumLength = min(nBufferLength * sizeof(WCHAR), USHRT_MAX); + BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + BufferU.MaximumLength); + if (BufferU.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + Buffer.MaximumLength = min(nBufferLength, USHRT_MAX); + Buffer.Buffer = lpBuffer; + + RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer, + NULL == lpFileName ? NULL : FileNameU.Buffer, + NULL == lpExtension ? NULL : ExtensionU.Buffer, + nBufferLength, + BufferU.Buffer, + &FilePartW); + + if (0 != RetValue) + { + BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + Status = RtlUnicodeStringToAnsiString(&Buffer, + &BufferU, + FALSE); + else + Status = RtlUnicodeStringToOemString(&Buffer, + &BufferU, + FALSE); + + if (NT_SUCCESS(Status) && Buffer.Buffer) + { + /* nul-terminate ascii string */ + Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; + + if (NULL != lpFilePart && BufferU.Length != 0) + { + *lpFilePart = strrchr (lpBuffer, '\\') + 1; + } + } + } + +Cleanup: + RtlFreeHeap (RtlGetProcessHeap (), + 0, + PathU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FileNameU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + ExtensionU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + BufferU.Buffer); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return RetValue; +} + + +/*********************************************************************** + * ContainsPath (Wine name: contains_pathW) + * + * Check if the file name contains a path; helper for SearchPathW. + * A relative path is not considered a path unless it starts with ./ or ../ + */ +static +BOOL +ContainsPath(LPCWSTR name) +{ + if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; + if (name[0] != '.') return FALSE; + if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE; + return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); +} + + +/* + * @implemented + */ +DWORD +WINAPI +SearchPathW(LPCWSTR lpPath, + LPCWSTR lpFileName, + LPCWSTR lpExtension, + DWORD nBufferLength, + LPWSTR lpBuffer, + LPWSTR *lpFilePart) +{ + DWORD ret = 0; + + if (!lpFileName || !lpFileName[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* If the name contains an explicit path, ignore the path */ + if (ContainsPath(lpFileName)) + { + /* try first without extension */ + if (RtlDoesFileExists_U(lpFileName)) + return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); + + if (lpExtension) + { + LPCWSTR p = wcsrchr(lpFileName, '.'); + if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) + lpExtension = NULL; /* Ignore the specified extension */ + } + + /* Allocate a buffer for the file name and extension */ + if (lpExtension) + { + LPWSTR tmp; + DWORD len = wcslen(lpFileName) + wcslen(lpExtension); + + if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + wcscpy(tmp, lpFileName); + wcscat(tmp, lpExtension); + if (RtlDoesFileExists_U(tmp)) + ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); + RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); + } + } + else if (lpPath && lpPath[0]) /* search in the specified path */ + { + ret = RtlDosSearchPath_U(lpPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + } + else /* search in the default path */ + { + WCHAR *DllPath = GetDllLoadPath(NULL); + + if (DllPath) + { + ret = RtlDosSearchPath_U(DllPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + } + + if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); + + return ret; +} + +/*********************************************************************** + * @implemented + * + * GetLongPathNameW (KERNEL32.@) + * + * NOTES + * observed (Win2000): + * shortpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0 + * shortpath="": LastError=ERROR_PATH_NOT_FOUND, ret=0 + */ +DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) +{ +#define MAX_PATHNAME_LEN 1024 + + WCHAR tmplongpath[MAX_PATHNAME_LEN]; + LPCWSTR p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + BOOL unixabsolute; + WIN32_FIND_DATAW wfd; + HANDLE goit; + + if (!shortpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!shortpath[0]) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return 0; + } + + DPRINT("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); + + if (shortpath[0] == '\\' && shortpath[1] == '\\') + { + DPRINT1("ERR: UNC pathname %s\n", shortpath); + lstrcpynW( longpath, shortpath, longlen ); + return wcslen(longpath); + } + unixabsolute = (shortpath[0] == '/'); + /* check for drive letter */ + if (!unixabsolute && shortpath[1] == ':' ) + { + tmplongpath[0] = shortpath[0]; + tmplongpath[1] = ':'; + lp = sp = 2; + } + + while (shortpath[sp]) + { + /* check for path delimiters and reproduce them */ + if (shortpath[sp] == '\\' || shortpath[sp] == '/') + { + if (!lp || tmplongpath[lp-1] != '\\') + { + /* strip double "\\" */ + tmplongpath[lp++] = '\\'; + } + tmplongpath[lp] = 0; /* terminate string */ + sp++; + continue; + } + + p = shortpath + sp; + if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) + { + tmplongpath[lp++] = *p++; + tmplongpath[lp++] = *p++; + } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (shortpath + sp); + lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); + /* Check if the file exists and use the existing file name */ + goit = FindFirstFileW(tmplongpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) + { + DPRINT("not found %s!\n", tmplongpath); + SetLastError ( ERROR_FILE_NOT_FOUND ); + return 0; + } + FindClose(goit); + wcscpy(tmplongpath + lp, wfd.cFileName); + lp += wcslen(tmplongpath + lp); + sp += tmplen; + } + tmplen = wcslen(shortpath) - 1; + if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && + (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) + tmplongpath[lp++] = shortpath[tmplen]; + tmplongpath[lp] = 0; + + tmplen = wcslen(tmplongpath) + 1; + if (tmplen <= longlen) + { + wcscpy(longpath, tmplongpath); + DPRINT("returning %s\n", longpath); + tmplen--; /* length without 0 */ + } + + return tmplen; +} + + + +/*********************************************************************** + * GetLongPathNameA (KERNEL32.@) + */ +DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) +{ + WCHAR *shortpathW; + WCHAR longpathW[MAX_PATH]; + DWORD ret; + + DPRINT("GetLongPathNameA %s, %i\n",shortpath,longlen ); + + if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) + return 0; + + ret = GetLongPathNameW(shortpathW, longpathW, MAX_PATH); + + if (!ret) return 0; + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(longpath, longlen, longpathW, ret+1 ); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/path.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -37,6 +37,7 @@ <file>heapmem.c</file> <file>job.c</file> <file>loader.c</file> + <file>path.c</file> <file>perfcnt.c</file> <file>power.c</file> <file>proc.c</file>

1 0

[ion] 54308: [KERNEL32]: Actually properly support ANSI vs OEM SetFileAPI instead of assuming Unicode->ANSI for most things. Note this just adds support, there's still many wine-synched APIs that a...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 01:47:49 2011 New Revision: 54308 URL: http://svn.reactos.org/svn/reactos?rev=54308&view=rev Log: [KERNEL32]: Actually properly support ANSI vs OEM SetFileAPI instead of assuming Unicode->ANSI for most things. Note this just adds support, there's still many wine-synched APIs that are using the FileNameA2W hacks and similar, which force ANSI. But it's a step in the right direction. Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Sun Nov 6 01:47:49 2011 @@ -175,6 +175,33 @@ return ret; } +ULONG +NTAPI +BasepUnicodeStringToOemSize(IN PUNICODE_STRING String) +{ + return RtlUnicodeStringToOemSize(String); +} + +ULONG +NTAPI +BasepOemStringToUnicodeSize(IN PANSI_STRING String) +{ + return RtlOemStringToUnicodeSize(String); +} + +ULONG +NTAPI +BasepUnicodeStringToAnsiSize(IN PUNICODE_STRING String) +{ + return RtlUnicodeStringToAnsiSize(String); +} + +ULONG +NTAPI +BasepAnsiStringToUnicodeSize(IN PANSI_STRING String) +{ + return RtlAnsiStringToUnicodeSize(String); +} /* * @implemented @@ -185,6 +212,9 @@ { /* Set the correct Base Api */ Basep8BitStringToUnicodeString = (PRTL_CONVERT_STRING)RtlOemStringToUnicodeString; + BasepUnicodeStringTo8BitString = RtlUnicodeStringToOemString; + BasepUnicodeStringTo8BitSize = BasepUnicodeStringToOemSize; + Basep8BitStringToUnicodeSize = BasepOemStringToUnicodeSize; /* FIXME: Old, deprecated way */ bIsFileApiAnsi = FALSE; @@ -200,7 +230,10 @@ { /* Set the correct Base Api */ Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; - + BasepUnicodeStringTo8BitString = RtlUnicodeStringToAnsiString; + BasepUnicodeStringTo8BitSize = BasepUnicodeStringToAnsiSize; + Basep8BitStringToUnicodeSize = BasepAnsiStringToUnicodeSize; + /* FIXME: Old, deprecated way */ bIsFileApiAnsi = TRUE; } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Nov 6 01:47:49 2011 @@ -22,6 +22,10 @@ /* GLOBALS ********************************************************************/ PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; +PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; +PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; + UNICODE_STRING Restricted = RTL_CONSTANT_STRING(L"Restricted"); /* FUNCTIONS ******************************************************************/ 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] Sun Nov 6 01:47:49 2011 @@ -25,9 +25,9 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) -#define debugstr_a +#define debugstr_a #define debugstr_w -#define wine_dbgstr_w +#define wine_dbgstr_w #define debugstr_guid #include "wine/unicode.h" @@ -70,7 +70,7 @@ /* Undocumented CreateProcess flag */ #define STARTF_SHELLPRIVATE 0x400 - + typedef struct _CODEPAGE_ENTRY { LIST_ENTRY Entry; @@ -169,14 +169,14 @@ BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL, IN PUNICODE_STRING ObjectName); - + NTSTATUS WINAPI BaseCreateStack(HANDLE hProcess, SIZE_T StackReserve, SIZE_T StackCommit, PINITIAL_TEB InitialTeb); - + VOID WINAPI BaseInitializeContext(IN PCONTEXT Context, @@ -184,7 +184,7 @@ IN PVOID StartAddress, IN PVOID StackAddress, IN ULONG ContextType); - + VOID WINAPI BaseThreadStartupThunk(VOID); @@ -192,13 +192,13 @@ VOID WINAPI BaseProcessStartThunk(VOID); - + __declspec(noreturn) VOID WINAPI BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter); - + VOID WINAPI BaseFreeThreadStack(IN HANDLE hProcess, @@ -214,7 +214,7 @@ VOID WINAPI BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress); - + PVOID WINAPI BasepIsRealtimeAllowed(IN BOOLEAN Keep); @@ -223,7 +223,7 @@ WINAPI BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, OUT LPWSTR* UnicodeString); - + PUNICODE_STRING WINAPI Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString); @@ -232,14 +232,25 @@ WINAPI Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString, IN LPCSTR String); - -#define BasepUnicodeStringTo8BitString RtlUnicodeStringToAnsiString typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, IN PANSI_STRING AnsiString, IN BOOLEAN AllocateMemory); - + +typedef ULONG (NTAPI *PRTL_COUNT_STRING)(IN PUNICODE_STRING UnicodeString); + +typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRINGA)(IN PANSI_STRING AnsiString, + IN PCUNICODE_STRING UnicodeString, + IN BOOLEAN AllocateMemory); + +typedef ULONG (NTAPI *PRTL_COUNT_STRINGA)(IN PANSI_STRING UnicodeString); + + extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +extern PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; +extern PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; +extern PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; + extern HANDLE BaseNamedObjectDirectory; HANDLE

1 0

[ion] 54307: [NTDLL]: Export RtlImageNtHeaderEx and LodrLoadAlternateResourceModule. [NDK]: Add LdrLoadAlternateResourceModule. Fix RtlDosApplyFileIsolationRedirection_UStr and add flags. [NTDLL]: ...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 01:34:06 2011 New Revision: 54307 URL: http://svn.reactos.org/svn/reactos?rev=54307&view=rev Log: [NTDLL]: Export RtlImageNtHeaderEx and LodrLoadAlternateResourceModule. [NDK]: Add LdrLoadAlternateResourceModule. Fix RtlDosApplyFileIsolationRedirection_UStr and add flags. [NTDLL]: Halfplement LdrLoad/UnloadAlternateResourceModule. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -88,7 +88,7 @@ ;@ stdcall LdrHotPatchRoutine ;@ stdcall LdrInitShimEngineDynamic @ stdcall LdrInitializeThunk(long long long long) -;@ stdcall LdrLoadAlternateResourceModule +@ stdcall LdrLoadAlternateResourceModule(ptr ptr) @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) ;@ stdcall LdrOpenImageFileOptionsKey ; 5.2 SP1 and higher @@ -566,7 +566,7 @@ @ stdcall RtlDllShutdownInProgress() @ stdcall RtlDnsHostNameToComputerName(ptr ptr long) @ stdcall RtlDoesFileExists_U(wstr) -;@ stdcall RtlDosApplyFileIsolationRedirection_Ustr +@ stdcall RtlDosApplyFileIsolationRedirection_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) ;@ stdcall RtlDosPathNameToNtPathName_U_WithStatus ; 5.2 SP1, and higher @ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) ; CHECKME @@ -690,7 +690,7 @@ @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) -;@ stdcall RtlImageNtHeaderEx +@ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long) @ stdcall RtlImageRvaToVa(ptr long long ptr) @ stdcall RtlImpersonateSelf(long) Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -19,8 +19,17 @@ LONG LdrpLoaderLockAcquisitonCount; BOOLEAN LdrpShowRecursiveLoads, LdrpBreakOnRecursiveDllLoads; UNICODE_STRING LdrApiDefaultExtension = RTL_CONSTANT_STRING(L".DLL"); +ULONG AlternateResourceModuleCount; /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +LdrAlternateResourcesEnabled(VOID) +{ + /* ReactOS does not support this */ + return FALSE; +} ULONG_PTR FORCEINLINE @@ -1524,15 +1533,46 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) { - //static BOOLEAN WarnedOnce = FALSE; - //if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } - return FALSE; -} - + ULONG_PTR Cookie; + + /* Acquire the loader lock */ + LdrLockLoaderLock(TRUE, NULL, &Cookie); + + /* Check if there's any alternate resources loaded */ + if (AlternateResourceModuleCount) + { + UNIMPLEMENTED; + } + + /* Release the loader lock */ + LdrUnlockLoaderLock(1, Cookie); + + /* All done */ + return TRUE; +} + +/* FIXME: Add to ntstatus.mc */ +#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001L) + +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrLoadAlternateResourceModule(IN PVOID Module, + IN PWSTR Buffer) +{ + /* Is MUI Support enabled? */ + if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; + + UNIMPLEMENTED; + return STATUS_MUI_FILE_NOT_FOUND; +} + /* EOF */ Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -518,21 +518,21 @@ return ImageBase; } +/* + * @unimplemented + */ NTSYSAPI NTSTATUS NTAPI -RtlDosApplyFileIsolationRedirection_Ustr( - IN BOOLEAN Unknown, - IN PUNICODE_STRING OriginalName, - IN PUNICODE_STRING Extension, - IN OUT PUNICODE_STRING RedirectedName, - IN OUT PUNICODE_STRING RedirectedName2, - IN OUT PUNICODE_STRING *OriginalName2, - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3 -) +RtlDosApplyFileIsolationRedirection_Ustr(IN ULONG Flags, + IN PUNICODE_STRING OriginalName, + IN PUNICODE_STRING Extension, + IN OUT PUNICODE_STRING StaticString, + IN OUT PUNICODE_STRING DynamicString, + IN OUT PUNICODE_STRING *NewName, + IN PULONG NewFlags, + IN PSIZE_T FileNameSize, + IN PSIZE_T RequiredLength) { return STATUS_SXS_KEY_NOT_FOUND; } - Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -56,6 +56,13 @@ IN PLDR_RESOURCE_INFO ResourceInfo, IN ULONG Level, OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory +); + +NTSTATUS +NTAPI +LdrLoadAlternateResourceModule( + IN PVOID Module, + IN PWSTR Buffer ); BOOLEAN Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -3275,15 +3275,15 @@ NTSTATUS NTAPI RtlDosApplyFileIsolationRedirection_Ustr( - IN BOOLEAN Unknown, + IN ULONG Flags, IN PUNICODE_STRING OriginalName, IN PUNICODE_STRING Extension, - IN OUT PUNICODE_STRING RedirectedName, - IN OUT PUNICODE_STRING RedirectedName2, - IN OUT PUNICODE_STRING *OriginalName2, - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3 + IN OUT PUNICODE_STRING StaticString, + IN OUT PUNICODE_STRING DynamicString, + IN OUT PUNICODE_STRING *NewName, + IN PULONG NewFlags, + IN PSIZE_T FileNameSize, + IN PSIZE_T RequiredLength ); NTSYSAPI 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] Sun Nov 6 01:34:06 2011 @@ -250,6 +250,11 @@ // RtlImageNtHeaderEx Flags // #define RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK 0x00000001 + +// +// RtlDosApplyFileIsolationRedirection_Ustr Flags +// +#define RTL_DOS_APPLY_FILE_REDIRECTION_USTR_FLAG_RESPECT_DOT_LOCAL 0x01 // // Codepages

1 0

[pschweitzer] 54306: [KERNEL32] Fix c/p mistake. Brought to you by Vincenzo Cotugno
by pschweitzer＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: pschweitzer Date: Sun Nov 6 00:09:33 2011 New Revision: 54306 URL: http://svn.reactos.org/svn/reactos?rev=54306&view=rev Log: [KERNEL32] Fix c/p mistake. Brought to you by Vincenzo Cotugno Modified: trunk/reactos/dll/win32/kernel32/client/job.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sun Nov 6 00:09:33 2011 @@ -132,7 +132,7 @@ ExpectedSize = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); JobInfo = &LocalInfo; } - else if (JobObjectInformationClass == JobObjectBasicLimitInformation) + else if (JobObjectInformationClass == JobObjectExtendedLimitInformation) { ExpectedSize = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); JobInfo = &LocalInfo; @@ -226,7 +226,7 @@ ExpectedSize = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); JobInfo = &LocalInfo; } - else if (JobObjectInformationClass == JobObjectBasicLimitInformation) + else if (JobObjectInformationClass == JobObjectExtendedLimitInformation) { ExpectedSize = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); JobInfo = &LocalInfo;

1 0

[spetreolle] 54305: -Add missing struct to winnt.h.
by spetreolle＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: spetreolle Date: Sun Nov 6 00:04:57 2011 New Revision: 54305 URL: http://svn.reactos.org/svn/reactos?rev=54305&view=rev Log: -Add missing struct to winnt.h. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Nov 6 00:04:57 2011 @@ -3223,6 +3223,12 @@ TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; +typedef enum _TOKEN_ELEVATION_TYPE { + TokenElevationTypeDefault = 1, + TokenElevationTypeFull, + TokenElevationTypeLimited, +} TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; + #include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId;

1 0

[tfaber] 54304: [MSHTML][SHDOCVW] - Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more d...
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 20:40:59 2011 New Revision: 54304 URL: http://svn.reactos.org/svn/reactos?rev=54304&view=rev Log: [MSHTML][SHDOCVW] - Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more details. Modified: trunk/reactos/dll/win32/mshtml/view.c trunk/reactos/dll/win32/shdocvw/client.c trunk/reactos/dll/win32/shdocvw/oleobject.c Modified: trunk/reactos/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -259,6 +259,7 @@ return FAILED(hres) ? hres : E_FAIL; } + frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &This->ip_window, &posrect, &cliprect, &frameinfo); if(FAILED(hres)) { Modified: trunk/reactos/dll/win32/shdocvw/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -227,7 +227,6 @@ GetClientRect(This->hwnd, lprcPosRect); *lprcClipRect = *lprcPosRect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = This->frame_hwnd; lpFrameInfo->haccel = NULL; Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -141,6 +141,7 @@ IOleInPlaceSite_OnInPlaceActivate(This->inplace); + This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow, &This->pos_rect, &This->clip_rect, &This->frameinfo);

1 0

[cmihail] 54303: [shell32] - Fix a few more winetests in shlfolder tests.
by cmihail＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: cmihail Date: Sat Nov 5 20:09:30 2011 New Revision: 54303 URL: http://svn.reactos.org/svn/reactos?rev=54303&view=rev Log: [shell32] - Fix a few more winetests in shlfolder tests. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp 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] Sat Nov 5 20:09:30 2011 @@ -426,7 +426,6 @@ if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) { *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - *pdwAttributes &= ~SFGAO_CANLINK; } else *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR);

1 0

[cgutman] 54302: [LWIP] - Properly sync to lwIP 1.4.0 - No code changes (except unit tests)
by cgutman＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: cgutman Date: Sat Nov 5 18:54:49 2011 New Revision: 54302 URL: http://svn.reactos.org/svn/reactos?rev=54302&view=rev Log: [LWIP] - Properly sync to lwIP 1.4.0 - No code changes (except unit tests) Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG trunk/reactos/lib/drivers/lwip/UPGRADING trunk/reactos/lib/drivers/lwip/doc/rawapi.txt trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CHANGELOG… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CHANGELOG [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CHANGELOG [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,17 +1,28 @@ -FUTURE - - * TODO: The lwIP source code makes some invalid assumptions on processor - word-length, storage sizes and alignment. See the mailing lists for - problems with exoteric (/DSP) architectures showing these problems. - We still have to fix some of these issues neatly. - HISTORY (CVS HEAD) * [Enter new changes just after this line - do not remove this line] + ++ New features: + + + ++ Bugfixes: + + + + +(STABLE-1.4.0) + ++ New features: + + 2011-03-27: Simon Goldschmidt + * tcp_impl.h, tcp_in.c, tcp_out.c: Removed 'dataptr' from 'struct tcp_seg' and + calculate it in tcp_zero_window_probe (the only place where it was used). + + 2010-11-21: Simon Goldschmidt + * dhcp.c/.h: Added a function to deallocate the struct dhcp from a netif + (fixes bug #31525). 2010-07-12: Simon Goldschmidt (patch by Stephane Lesage) * ip.c, udp.c/.h, pbuf.h, sockets.c: task #10495: Added support for @@ -228,6 +239,137 @@ ++ Bugfixes: + + 2011-04-20: Simon Goldschmidt + * sys_arch.txt: sys_arch_timeouts() is not needed any more. + + 2011-04-13: Simon Goldschmidt + * tcp.c, udp.c: Fixed bug #33048 (Bad range for IP source port numbers) by + using ports in the IANA private/dynamic range (49152 through 65535). + + 2011-03-29: Simon Goldschmidt, patch by Emil Lhungdahl: + * etharp.h/.c: Fixed broken VLAN support. + + 2011-03-27: Simon Goldschmidt + * tcp.c: Fixed bug #32926 (TCP_RMV(&tcp_bound_pcbs) is called on unbound tcp + pcbs) by checking if the pcb was bound (local_port != 0). + + 2011-03-27: Simon Goldschmidt + * ppp.c: Fixed bug #32280 (ppp: a pbuf is freed twice) + + 2011-03-27: Simon Goldschmidt + * sockets.c: Fixed bug #32906: lwip_connect+lwip_send did not work for udp and + raw pcbs with LWIP_TCPIP_CORE_LOCKING==1. + + 2011-03-27: Simon Goldschmidt + * tcp_out.c: Fixed bug #32820 (Outgoing TCP connections created before route + is present never times out) by starting retransmission timer before checking + route. + + 2011-03-22: Simon Goldschmidt + * ppp.c: Fixed bug #32648 (PPP code crashes when terminating a link) by only + calling sio_read_abort() if the file descriptor is valid. + + 2011-03-14: Simon Goldschmidt + * err.h/.c, sockets.c, api_msg.c: fixed bug #31748 (Calling non-blocking connect + more than once can render a socket useless) since it mainly involves changing + "FATAL" classification of error codes: ERR_USE and ERR_ISCONN just aren't fatal. + + 2011-03-13: Simon Goldschmidt + * sockets.c: fixed bug #32769 (ESHUTDOWN is linux-specific) by fixing + err_to_errno_table (ERR_CLSD: ENOTCONN instead of ESHUTDOWN), ERR_ISCONN: + use EALRADY instead of -1 + + 2011-03-13: Simon Goldschmidt + * api_lib.c: netconn_accept: return ERR_ABRT instead of ERR_CLSD if the + connection has been aborted by err_tcp (since this is not a normal closing + procedure). + + 2011-03-13: Simon Goldschmidt + * tcp.c: tcp_bind: return ERR_VAL instead of ERR_ISCONN when trying to bind + with pcb->state != CLOSED + + 2011-02-17: Simon Goldschmidt + * rawapi.txt: Fixed bug #32561 tcp_poll argument definition out-of-order in + documentation + + 2011-02-17: Simon Goldschmidt + * many files: Added missing U/UL modifiers to fix 16-bit-arch portability. + + 2011-01-24: Simon Goldschmidt + * sockets.c: Fixed bug #31741: lwip_select seems to have threading problems + + 2010-12-02: Simon Goldschmidt + * err.h: Fixed ERR_IS_FATAL so that ERR_WOULDBLOCK is not fatal. + + 2010-11-23: Simon Goldschmidt + * api.h, api_lib.c, api_msg.c, sockets.c: netconn.recv_avail is only used for + LWIP_SO_RCVBUF and ioctl/FIONREAD. + + 2010-11-23: Simon Goldschmidt + * etharp.c: Fixed bug #31720: ARP-queueing: RFC 1122 recommends to queue at + least 1 packet -> ARP_QUEUEING==0 now queues the most recent packet. + + 2010-11-23: Simon Goldschmidt + * tcp_in.c: Fixed bug #30577: tcp_input: don't discard ACK-only packets after + refusing 'refused_data' again. + + 2010-11-22: Simon Goldschmidt + * sockets.c: Fixed bug #31590: getsockopt(... SO_ERROR ...) gives EINPROGRESS + after a successful nonblocking connection. + + 2010-11-22: Simon Goldschmidt + * etharp.c: Fixed bug #31722: IP packets sent with an AutoIP source addr + must be sent link-local + + 2010-11-22: Simon Goldschmidt + * timers.c: patch #7329: tcp_timer_needed prototype was ifdef'ed out for + LWIP_TIMERS==0 + + 2010-11-20: Simon Goldschmidt + * sockets.c: Fixed bug #31170: lwip_setsockopt() does not set socket number + + 2010-11-20: Simon Goldschmidt + * sockets.h: Fixed bug #31304: Changed SHUT_RD, SHUT_WR and SHUT_RDWR to + resemble other stacks. + + 2010-11-20: Simon Goldschmidt + * dns.c: Fixed bug #31535: TCP_SND_QUEUELEN must be at least 2 or else + no-copy TCP writes will never succeed. + + 2010-11-20: Simon Goldschmidt + * dns.c: Fixed bug #31701: Error return value from dns_gethostbyname() does + not match documentation: return ERR_ARG instead of ERR_VAL if not + initialized or wrong argument. + + 2010-10-20: Simon Goldschmidt + * sockets.h: Fixed bug #31385: sizeof(struct sockaddr) is 30 but should be 16 + + 2010-10-05: Simon Goldschmidt + * dhcp.c: Once again fixed #30038: DHCP/AutoIP cooperation failed when + replugging the network cable after an AutoIP address was assigned. + + 2010-08-10: Simon Goldschmidt + * tcp.c: Fixed bug #30728: tcp_new_port() did not check listen pcbs + + 2010-08-03: Simon Goldschmidt + * udp.c, raw.c: Don't chain empty pbufs when sending them (fixes bug #30625) + + 2010-08-01: Simon Goldschmidt (patch by Greg Renda) + * ppp.c: Applied patch #7264 (PPP protocols are rejected incorrectly on big + endian architectures) + + 2010-07-28: Simon Goldschmidt + * api_lib.c, api_msg.c, sockets.c, mib2.c: Fixed compilation with TCP or UDP + disabled. + + 2010-07-27: Simon Goldschmidt + * tcp.c: Fixed bug #30565 (tcp_connect() check bound list): that check did no + harm but never did anything + + 2010-07-21: Simon Goldschmidt + * ip.c: Fixed invalid fix for bug #30402 (CHECKSUM_GEN_IP_INLINE does not + add IP options) 2010-07-16: Kieran Mansley * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator Modified: trunk/reactos/lib/drivers/lwip/UPGRADING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/UPGRADING… ============================================================================== --- trunk/reactos/lib/drivers/lwip/UPGRADING [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/UPGRADING [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -111,11 +111,16 @@ * Added const char* name to mem- and memp-stats for easier debugging. * Calculate the TCP/UDP checksum while copying to only fetch data once: - Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum + Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum * Added SO_REUSE_RXTOALL to pass received UDP broadcast/multicast packets to more than one pcb. + * Changed the semantics of ARP_QUEUEING==0: ARP_QUEUEING now cannot be turned + off any more, if this is set to 0, only one packet (the most recent one) is + queued (like demanded by RFC 1122). + + ++ Major bugfixes/improvements * Implemented tcp_shutdown() to only shut down one end of a connection Modified: trunk/reactos/lib/drivers/lwip/doc/rawapi.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/rawap… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/rawapi.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/rawapi.txt [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -251,8 +251,9 @@ the application may use the polling functionality to call tcp_write() again when the connection has been idle for a while. -- void tcp_poll(struct tcp_pcb *pcb, u8_t interval, - err_t (* poll)(void *arg, struct tcp_pcb *tpcb)) +- void tcp_poll(struct tcp_pcb *pcb, + err_t (* poll)(void *arg, struct tcp_pcb *tpcb), + u8_t interval) Specifies the polling interval and the callback function that should be called to poll the application. The interval is specified in Modified: trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/sys_a… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -122,18 +122,6 @@ #define sys_arch_mbox_tryfetch(mbox,msg) \ sys_arch_mbox_fetch(mbox,msg,1) although this would introduce unnecessary delays. - -- struct sys_timeouts *sys_arch_timeouts(void) - - Returns a pointer to the per-thread sys_timeouts structure. In lwIP, - each thread has a list of timeouts which is repressented as a linked - list of sys_timeout structures. The sys_timeouts structure holds a - pointer to a linked list of timeouts. This function is called by - the lwIP timeout scheduler and must not return a NULL value. - - In a single thread sys_arch implementation, this function will - simply return a pointer to a global sys_timeouts variable stored in - the sys_arch module. If threads are supported by the underlying operating system and if such functionality is needed in lwIP, the following function will have Modified: trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -78,20 +78,6 @@ static err_t tcp_listen_input(struct tcp_pcb_listen *pcb); static err_t tcp_timewait_input(struct tcp_pcb *pcb); - -static const char * const tcp_state_str[] = { - "CLOSED", - "LISTEN", - "SYN_SENT", - "SYN_RCVD", - "ESTABLISHED", - "FIN_WAIT_1", - "FIN_WAIT_2", - "CLOSE_WAIT", - "CLOSING", - "LAST_ACK", - "TIME_WAIT" -}; /** * The initial input processing of TCP. It verifies the TCP header, demultiplexes Modified: trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -23,7 +23,7 @@ Suite *s = suite_create(name); for(i = 0; i < num_tests; i++) { - // Core test case + /* Core test case */ TCase *tc_core = tcase_create("Core"); if ((setup != NULL) || (teardown != NULL)) { tcase_add_checked_fixture(tc_core, setup, teardown); Modified: trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -3,6 +3,8 @@ #include "udp/test_udp.h" #include "tcp/test_tcp.h" #include "tcp/test_tcp_oos.h" +#include "core/test_mem.h" +#include "etharp/test_etharp.h" #include "lwip/init.h" @@ -16,6 +18,8 @@ udp_suite, tcp_suite, tcp_oos_suite, + mem_suite, + etharp_suite, }; size_t num = sizeof(suites)/sizeof(void*); LWIP_ASSERT("No suites defined", num > 0); Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "tcp_helper.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "lwip/pbuf.h" #include "lwip/inet_chksum.h" @@ -27,7 +27,6 @@ void tcp_remove_all(void) { - //tcp_remove(tcp_bound_pcbs); tcp_remove(tcp_listen_pcbs.pcbs); tcp_remove(tcp_active_pcbs); tcp_remove(tcp_tw_pcbs); @@ -51,14 +50,14 @@ /** Create a TCP segment usable for passing to tcp_input */ struct pbuf* -tcp_create_segment(struct ip_addr* src_ip, struct ip_addr* dst_ip, +tcp_create_segment(ip_addr_t* src_ip, ip_addr_t* dst_ip, u16_t src_port, u16_t dst_port, void* data, size_t data_len, u32_t seqno, u32_t ackno, u8_t headerflags) { struct pbuf* p; struct ip_hdr* iphdr; struct tcp_hdr* tcphdr; - u16_t pbuf_len = sizeof(struct ip_hdr) + sizeof(struct tcp_hdr) + data_len; + u16_t pbuf_len = (u16_t)(sizeof(struct ip_hdr) + sizeof(struct tcp_hdr) + data_len); p = pbuf_alloc(PBUF_RAW, pbuf_len, PBUF_POOL); EXPECT_RETNULL(p != NULL); @@ -83,13 +82,14 @@ tcphdr->ackno = htonl(ackno); TCPH_HDRLEN_SET(tcphdr, sizeof(struct tcp_hdr)/4); TCPH_FLAGS_SET(tcphdr, headerflags); - tcphdr->wnd = htonl(TCP_WND); + tcphdr->wnd = htons(TCP_WND); /* copy data */ memcpy((char*)tcphdr + sizeof(struct tcp_hdr), data, data_len); /* calculate checksum */ - tcphdr->chksum = inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), + + tcphdr->chksum = inet_chksum_pseudo(p, src_ip, dst_ip, IP_PROTO_TCP, p->tot_len); pbuf_header(p, sizeof(struct ip_hdr)); @@ -99,8 +99,8 @@ /** Safely bring a tcp_pcb into the requested state */ void -tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, struct ip_addr* local_ip, - struct ip_addr* remote_ip, u16_t local_port, u16_t remote_port) +tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, + ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port) { /* @todo: are these all states? */ /* @todo: remove from previous list */ @@ -194,3 +194,20 @@ } return pcb; } + +/** Calls tcp_input() after adjusting current_iphdr_dest */ +void test_tcp_input(struct pbuf *p, struct netif *inp) +{ + struct ip_hdr *iphdr = (struct ip_hdr*)p->payload; + ip_addr_copy(current_iphdr_dest, iphdr->dest); + ip_addr_copy(current_iphdr_src, iphdr->src); + current_netif = inp; + current_header = iphdr; + + tcp_input(p, inp); + + current_iphdr_dest.addr = 0; + current_iphdr_src.addr = 0; + current_netif = NULL; + current_header = NULL; +} Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -21,16 +21,18 @@ /* Helper functions */ void tcp_remove_all(void); -struct pbuf* tcp_create_segment(struct ip_addr* src_ip, struct ip_addr* dst_ip, +struct pbuf* tcp_create_segment(ip_addr_t* src_ip, ip_addr_t* dst_ip, u16_t src_port, u16_t dst_port, void* data, size_t data_len, u32_t seqno, u32_t ackno, u8_t headerflags); struct pbuf* tcp_create_rx_segment(struct tcp_pcb* pcb, void* data, size_t data_len, u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags); -void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, struct ip_addr* local_ip, - struct ip_addr* remote_ip, u16_t local_port, u16_t remote_port); +void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, + ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port); void test_tcp_counters_err(void* arg, err_t err); err_t test_tcp_counters_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err); struct tcp_pcb* test_tcp_new_counters_pcb(struct test_tcp_counters* counters); +void test_tcp_input(struct pbuf *p, struct netif *inp); + #endif Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "test_tcp.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "tcp_helper.h" @@ -50,7 +50,7 @@ struct tcp_pcb* pcb; struct pbuf* p; char data[] = {1, 2, 3, 4}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -76,7 +76,7 @@ EXPECT(p != NULL); if (p != NULL) { /* pass the segment to tcp_input */ - tcp_input(p, &netif); + test_tcp_input(p, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "test_tcp_oos.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "tcp_helper.h" @@ -60,7 +60,7 @@ return 0; } -/** Get the tcplen of a segment (by index) on the ooseq list +/** Get the tcplen (datalen + SYN/FIN) of a segment (by index) on the ooseq list * * @param pcb the pcb to check for ooseq segments * @param seg_index index of the segment on the ooseq list @@ -82,6 +82,25 @@ } fail(); return -1; +} + +/** Get the tcplen (datalen + SYN/FIN) of all segments on the ooseq list + * + * @param pcb the pcb to check for ooseq segments + * @return tcplen of all segment + */ +static int +tcp_oos_tcplen(struct tcp_pcb* pcb) +{ + int len = 0; + struct tcp_seg* seg = pcb->ooseq; + + /* then check the actual segment */ + while(seg != NULL) { + len += TCP_TCPLEN(seg); + seg = seg->next; + } + return len; } /* Setup/teardown functions */ @@ -115,7 +134,7 @@ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -161,7 +180,7 @@ EXPECT(p_fin != NULL); if ((pinseq != NULL) && (p_8_9 != NULL) && (p_4_8 != NULL) && (p_4_10 != NULL) && (p_2_14 != NULL) && (p_fin != NULL)) { /* pass the segment to tcp_input */ - tcp_input(p_8_9, &netif); + test_tcp_input(p_8_9, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -173,7 +192,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_4_8, &netif); + test_tcp_input(p_4_8, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -187,7 +206,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_4_10, &netif); + test_tcp_input(p_4_10, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -201,35 +220,31 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_2_14, &netif); - /* check if counters are as expected */ - EXPECT(counters.close_calls == 0); - EXPECT(counters.recv_calls == 0); - EXPECT(counters.recved_bytes == 0); - EXPECT(counters.err_calls == 0); - /* check ooseq queue */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); + test_tcp_input(p_2_14, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 6); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 8); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ - - /* pass the segment to tcp_input */ - tcp_input(p_fin, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 15); /* includes FIN */ + + /* pass the segment to tcp_input */ + test_tcp_input(p_fin, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); EXPECT(counters.recved_bytes == 0); EXPECT(counters.err_calls == 0); /* ooseq queue: unchanged */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); + EXPECT_OOSEQ(tcp_oos_count(pcb) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 6); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 8); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ - - /* pass the segment to tcp_input */ - tcp_input(pinseq, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 15); /* includes FIN */ + + /* pass the segment to tcp_input */ + test_tcp_input(pinseq, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 1); EXPECT(counters.recv_calls == 1); @@ -259,7 +274,7 @@ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -315,7 +330,7 @@ if ((pinseq != NULL) && (p_1_2 != NULL) && (p_4_8 != NULL) && (p_3_11 != NULL) && (p_2_12 != NULL) && (p_15_1 != NULL) && (p_15_1a != NULL) && (pinseqFIN != NULL)) { /* pass the segment to tcp_input */ - tcp_input(p_1_2, &netif); + test_tcp_input(p_1_2, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -327,7 +342,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 2); /* pass the segment to tcp_input */ - tcp_input(p_4_8, &netif); + test_tcp_input(p_4_8, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -341,7 +356,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 8); /* pass the segment to tcp_input */ - tcp_input(p_3_11, &netif); + test_tcp_input(p_3_11, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -356,23 +371,21 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 11); /* pass the segment to tcp_input */ - tcp_input(p_2_12, &netif); - /* check if counters are as expected */ - EXPECT(counters.close_calls == 0); - EXPECT(counters.recv_calls == 0); - EXPECT(counters.recved_bytes == 0); - EXPECT(counters.err_calls == 0); - /* check ooseq queue */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 3); + test_tcp_input(p_2_12, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 1); EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 1); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 2) == 3); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 2) == 11); - - /* pass the segment to tcp_input */ - tcp_input(pinseq, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 12); + + /* pass the segment to tcp_input */ + test_tcp_input(pinseq, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -381,7 +394,7 @@ EXPECT(pcb->ooseq == NULL); /* pass the segment to tcp_input */ - tcp_input(p_15_1, &netif); + test_tcp_input(p_15_1, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -393,7 +406,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); /* pass the segment to tcp_input */ - tcp_input(p_15_1a, &netif); + test_tcp_input(p_15_1a, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -405,7 +418,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); /* pass the segment to tcp_input */ - tcp_input(pinseqFIN, &netif); + test_tcp_input(pinseqFIN, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 1); EXPECT(counters.recv_calls == 2); @@ -421,6 +434,99 @@ } END_TEST +static char data_full_wnd[TCP_WND]; + +/** create multiple segments and pass them to tcp_input with the first segment missing + * to simulate overruning the rxwin with ooseq queueing enabled */ +START_TEST(test_tcp_recv_ooseq_overrun_rxwin) +{ + int i, k; + struct test_tcp_counters counters; + struct tcp_pcb* pcb; + struct pbuf *pinseq, *p_ovr; + ip_addr_t remote_ip, local_ip; + u16_t remote_port = 0x100, local_port = 0x101; + struct netif netif; + int datalen = 0; + int datalen2; + LWIP_UNUSED_ARG(_i); + + for(i = 0; i < sizeof(data_full_wnd); i++) { + data_full_wnd[i] = (char)i; + } + + /* initialize local vars */ + memset(&netif, 0, sizeof(netif)); + IP4_ADDR(&local_ip, 192, 168, 1, 1); + IP4_ADDR(&remote_ip, 192, 168, 1, 2); + /* initialize counter struct */ + memset(&counters, 0, sizeof(counters)); + counters.expected_data_len = TCP_WND; + counters.expected_data = data_full_wnd; + + /* create and initialize the pcb */ + pcb = test_tcp_new_counters_pcb(&counters); + EXPECT_RET(pcb != NULL); + tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); + pcb->rcv_nxt = 0x8000; + + /* create segments */ + /* pinseq is sent as last segment! */ + pinseq = tcp_create_rx_segment(pcb, &data_full_wnd[0], TCP_MSS, 0, 0, TCP_ACK); + + for(i = TCP_MSS, k = 0; i < TCP_WND; i += TCP_MSS, k++) { + int count, expected_datalen; + struct pbuf *p = tcp_create_rx_segment(pcb, &data_full_wnd[TCP_MSS*(k+1)], + TCP_MSS, TCP_MSS*(k+1), 0, TCP_ACK); + EXPECT(p != NULL); + /* pass the segment to tcp_input */ + test_tcp_input(p, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + count = tcp_oos_count(pcb); + EXPECT_OOSEQ(count == k+1); + datalen = tcp_oos_tcplen(pcb); + if (i + TCP_MSS < TCP_WND) { + expected_datalen = (k+1)*TCP_MSS; + } else { + expected_datalen = TCP_WND - TCP_MSS; + } + if (datalen != expected_datalen) { + EXPECT_OOSEQ(datalen == expected_datalen); + } + } + + /* pass in one more segment, cleary overrunning the rxwin */ + p_ovr = tcp_create_rx_segment(pcb, &data_full_wnd[TCP_MSS*(k+1)], TCP_MSS, TCP_MSS*(k+1), 0, TCP_ACK); + EXPECT(p_ovr != NULL); + /* pass the segment to tcp_input */ + test_tcp_input(p_ovr, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == k); + datalen2 = tcp_oos_tcplen(pcb); + EXPECT_OOSEQ(datalen == datalen2); + + /* now pass inseq */ + test_tcp_input(pinseq, &netif); + EXPECT(pcb->ooseq == NULL); + + /* make sure the pcb is freed */ + EXPECT(lwip_stats.memp[MEMP_TCP_PCB].used == 1); + tcp_abort(pcb); + EXPECT(lwip_stats.memp[MEMP_TCP_PCB].used == 0); +} +END_TEST + + /** Create the suite including all tests for this module */ Suite * tcp_oos_suite(void) @@ -428,6 +534,7 @@ TFun tests[] = { test_tcp_recv_ooseq_FIN_OOSEQ, test_tcp_recv_ooseq_FIN_INSEQ, + test_tcp_recv_ooseq_overrun_rxwin, }; return create_suite("TCP_OOS", tests, sizeof(tests)/sizeof(TFun), tcp_oos_setup, tcp_oos_teardown); } Modified: trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -56,17 +56,6 @@ } END_TEST -START_TEST(test_udp_remove) -{ - struct udp_pcb* pcb; - LWIP_UNUSED_ARG(_i); - - pcb = NULL; - //pcb = udp_new(); - //fail_unless(pcb != NULL); -} -END_TEST - /** Create the suite including all tests for this module */ Suite * @@ -74,7 +63,6 @@ { TFun tests[] = { test_udp_new_remove, - test_udp_remove }; return create_suite("UDP", tests, sizeof(tests)/sizeof(TFun), udp_setup, udp_teardown); }

1 0

[akhaldi] 54301: [SHELL32] * Fix rbuild build. * Remove a debug breakpoint that is no longer needed.
by akhaldi＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: akhaldi Date: Sat Nov 5 17:56:10 2011 New Revision: 54301 URL: http://svn.reactos.org/svn/reactos?rev=54301&view=rev Log: [SHELL32] * Fix rbuild build. * Remove a debug breakpoint that is no longer needed. Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sat Nov 5 17:56:10 2011 @@ -20,6 +20,7 @@ <library>user32</library> <library>comctl32</library> <library>comdlg32</library> + <library>shdocvw</library> <library>shlwapi</library> <library>ole32</library> <library>version</library> Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Sat Nov 5 17:56:10 2011 @@ -373,7 +373,6 @@ { lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); hr = _ILCreateFromPathW(szPath, &pidlTemp); - __debugbreak(); } else {

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