Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[pschweitzer] 71037: [BTRFS] Import the WinBtrfs 0.2 driver from https://github.com/maharmstone/btrfs. Based on the initial work from Peter Hater, with various modification and patches sent upstrea...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Mar 23 20:35:05 2016 New Revision: 71037 URL: http://svn.reactos.org/svn/reactos?rev=71037&view=rev Log: [BTRFS] Import the WinBtrfs 0.2 driver from https://github.com/maharmstone/btrfs. Based on the initial work from Peter Hater, with various modification and patches sent upstream (yay, yet another collaboration :-)). This driver is in its earlies, so expect crashes, issues, and so on. We'll keep it updated to get rid of these issues. For now, it reads really well from a btrfs volume! CORE-10892 Added: trunk/reactos/drivers/filesystems/btrfs/ trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt (with props) trunk/reactos/drivers/filesystems/btrfs/btrfs.c (with props) trunk/reactos/drivers/filesystems/btrfs/btrfs.h (with props) trunk/reactos/drivers/filesystems/btrfs/btrfs.rc (with props) trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h (with props) trunk/reactos/drivers/filesystems/btrfs/cache.c (with props) trunk/reactos/drivers/filesystems/btrfs/crc32c.c (with props) trunk/reactos/drivers/filesystems/btrfs/create.c (with props) trunk/reactos/drivers/filesystems/btrfs/dirctrl.c (with props) trunk/reactos/drivers/filesystems/btrfs/fastio.c (with props) trunk/reactos/drivers/filesystems/btrfs/fileinfo.c (with props) trunk/reactos/drivers/filesystems/btrfs/flushthread.c (with props) trunk/reactos/drivers/filesystems/btrfs/fsctl.c (with props) trunk/reactos/drivers/filesystems/btrfs/loader.c (with props) trunk/reactos/drivers/filesystems/btrfs/read.c (with props) trunk/reactos/drivers/filesystems/btrfs/reparse.c (with props) trunk/reactos/drivers/filesystems/btrfs/resource.h (with props) trunk/reactos/drivers/filesystems/btrfs/search.c (with props) trunk/reactos/drivers/filesystems/btrfs/security.c (with props) trunk/reactos/drivers/filesystems/btrfs/treefuncs.c (with props) trunk/reactos/drivers/filesystems/btrfs/write.c (with props) Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… Added: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/btrfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/crc32c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/flushthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/reparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/treefuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…

8 years, 9 months

[pschweitzer] 71036: [NTOSKRNL_VISTA] Introduce a new library dedicated to recent drivers: ntoskrnl_vista. Its purpose is to provide some Vista+ syscalls to drivers that would require them. Only 's...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Mar 23 20:01:51 2016 New Revision: 71036 URL: http://svn.reactos.org/svn/reactos?rev=71036&view=rev Log: [NTOSKRNL_VISTA] Introduce a new library dedicated to recent drivers: ntoskrnl_vista. Its purpose is to provide some Vista+ syscalls to drivers that would require them. Only 'simple' syscalls not depending on internal structures can land in this library (for the others, you're doomed ;-)). This library is to be statically linked to your driver. For the initial commit, the following syscalls have been implemented: - RtlUnicodeToUTF8N(), RtlUTF8ToUnicodeN(), taken from Wine trunk, implemented by Thomas - FsRtlRemoveDotsFromPath() implemented for the library These three are required by the WinBtrfs FS driver CORE-10892 Added: trunk/reactos/lib/drivers/ntoskrnl_vista/ trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt (with props) trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c (with props) trunk/reactos/lib/drivers/ntoskrnl_vista/rtl.c (with props) Modified: trunk/reactos/lib/drivers/CMakeLists.txt Modified: trunk/reactos/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/CMakeLists.txt [iso-8859-1] Wed Mar 23 20:01:51 2016 @@ -5,4 +5,5 @@ add_subdirectory(ip) add_subdirectory(libusb) add_subdirectory(lwip) +add_subdirectory(ntoskrnl_vista) add_subdirectory(sound) Added: trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ntoskrnl_vista… ============================================================================== --- trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt (added) +++ trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt [iso-8859-1] Wed Mar 23 20:01:51 2016 @@ -0,0 +1,11 @@ +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions(-DUNICODE -D_UNICODE) + +list(APPEND SOURCE + fsrtl.c + rtl.c) + +add_library(ntoskrnl_vista ${SOURCE}) +add_dependencies(ntoskrnl_vista bugcodes xdk) Propchange: trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ntoskrnl_vista… ============================================================================== --- trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c (added) +++ trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c [iso-8859-1] Wed Mar 23 20:01:51 2016 @@ -0,0 +1,121 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/drivers/ntoskrnl_vista/fsrtl.c + * PURPOSE: FsRtl functions of Vista+ + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <ntdef.h> +#include <ntifs.h> + +NTKERNELAPI +NTSTATUS +NTAPI +FsRtlRemoveDotsFromPath(IN PWSTR OriginalString, + IN USHORT PathLength, + OUT USHORT *NewLength) +{ + USHORT Length, ReadPos, WritePos = 0; + + Length = PathLength / sizeof(WCHAR); + + if (Length == 3 && OriginalString[0] == '\\' && OriginalString[1] == '.' && OriginalString[2] == '.') + { + return STATUS_IO_REPARSE_DATA_INVALID; + } + + if (Length == 2 && OriginalString[0] == '.' && OriginalString[1] == '.') + { + return STATUS_IO_REPARSE_DATA_INVALID; + } + + if (Length > 2 && OriginalString[0] == '.' && OriginalString[1] == '.' && OriginalString[2] == '\\') + { + return STATUS_IO_REPARSE_DATA_INVALID; + } + + if (Length > 0) + { + ReadPos = 0; + + for (; ReadPos < Length; ++WritePos) + { + for (; ReadPos < Length; ++ReadPos) + { + if (ReadPos < Length - 1 && OriginalString[ReadPos] == '\\' && OriginalString[ReadPos + 1] == '\\') + { + continue; + } + + if (OriginalString[ReadPos] != '.') + { + break; + } + + if (ReadPos == Length - 1) + { + if (OriginalString[ReadPos - 1] == '\\') + { + if (WritePos > 1) + { + --WritePos; + } + + continue; + } + + OriginalString[WritePos] = '.'; + ++WritePos; + continue; + } + + if (OriginalString[ReadPos + 1] == '\\') + { + if (OriginalString[ReadPos - 1] != '\\') + { + OriginalString[WritePos] = '.'; + ++WritePos; + continue; + } + } + else + { + if (OriginalString[ReadPos + 1] != '.' || OriginalString[ReadPos - 1] != '\\' || + ((ReadPos != Length - 2) && OriginalString[ReadPos + 2] != '\\')) + { + OriginalString[WritePos] = '.'; + ++WritePos; + continue; + } + + for (WritePos -= 2; (SHORT)WritePos > 0 && OriginalString[WritePos] != '\\'; --WritePos); + + if ((SHORT)WritePos < 0 || OriginalString[WritePos] != '\\') + { + return STATUS_IO_REPARSE_DATA_INVALID; + } + + if (WritePos == 0 && ReadPos == Length - 2) + { + WritePos = 1; + } + } + + ++ReadPos; + } + + OriginalString[WritePos] = OriginalString[ReadPos]; + ++ReadPos; + } + } + + *NewLength = WritePos * sizeof(WCHAR); + + while (WritePos < Length) + { + OriginalString[WritePos++] = UNICODE_NULL; + } + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/drivers/ntoskrnl_vista/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ntoskrnl_vista… ============================================================================== --- trunk/reactos/lib/drivers/ntoskrnl_vista/rtl.c (added) +++ trunk/reactos/lib/drivers/ntoskrnl_vista/rtl.c [iso-8859-1] Wed Mar 23 20:01:51 2016 @@ -0,0 +1,263 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/drivers/ntoskrnl_vista/rtl.c + * PURPOSE: Rtl functions of Vista+ + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <ntdef.h> +#include <ntifs.h> + +typedef UCHAR BYTE; + +/****************************************************************************** + * RtlUnicodeToUTF8N [NTDLL.@] + */ +NTSTATUS NTAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, + ULONG *utf8_bytes_written, + const WCHAR *uni_src, ULONG uni_bytes) +{ + NTSTATUS status; + ULONG i; + ULONG written; + ULONG ch; + BYTE utf8_ch[4]; + ULONG utf8_ch_len; + + if (!uni_src) + return STATUS_INVALID_PARAMETER_4; + if (!utf8_bytes_written) + return STATUS_INVALID_PARAMETER; + if (utf8_dest && uni_bytes % sizeof(WCHAR)) + return STATUS_INVALID_PARAMETER_5; + + written = 0; + status = STATUS_SUCCESS; + + for (i = 0; i < uni_bytes / sizeof(WCHAR); i++) + { + /* decode UTF-16 into ch */ + ch = uni_src[i]; + if (ch >= 0xdc00 && ch <= 0xdfff) + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + else if (ch >= 0xd800 && ch <= 0xdbff) + { + if (i + 1 < uni_bytes / sizeof(WCHAR)) + { + ch -= 0xd800; + ch <<= 10; + if (uni_src[i + 1] >= 0xdc00 && uni_src[i + 1] <= 0xdfff) + { + ch |= uni_src[i + 1] - 0xdc00; + ch += 0x010000; + i++; + } + else + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + else + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + + /* encode ch as UTF-8 */ +#ifndef __REACTOS__ + assert(ch <= 0x10ffff); +#endif + if (ch < 0x80) + { + utf8_ch[0] = ch & 0x7f; + utf8_ch_len = 1; + } + else if (ch < 0x800) + { + utf8_ch[0] = 0xc0 | (ch >> 6 & 0x1f); + utf8_ch[1] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 2; + } + else if (ch < 0x10000) + { + utf8_ch[0] = 0xe0 | (ch >> 12 & 0x0f); + utf8_ch[1] = 0x80 | (ch >> 6 & 0x3f); + utf8_ch[2] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 3; + } + else if (ch < 0x200000) + { + utf8_ch[0] = 0xf0 | (ch >> 18 & 0x07); + utf8_ch[1] = 0x80 | (ch >> 12 & 0x3f); + utf8_ch[2] = 0x80 | (ch >> 6 & 0x3f); + utf8_ch[3] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 4; + } + + if (!utf8_dest) + { + written += utf8_ch_len; + continue; + } + + if (utf8_bytes_max >= utf8_ch_len) + { + memcpy(utf8_dest, utf8_ch, utf8_ch_len); + utf8_dest += utf8_ch_len; + utf8_bytes_max -= utf8_ch_len; + written += utf8_ch_len; + } + else + { + utf8_bytes_max = 0; + status = STATUS_BUFFER_TOO_SMALL; + } + } + + *utf8_bytes_written = written; + return status; +} + + +/****************************************************************************** + * RtlUTF8ToUnicodeN [NTDLL.@] + */ +NTSTATUS NTAPI RtlUTF8ToUnicodeN(WCHAR *uni_dest, ULONG uni_bytes_max, + ULONG *uni_bytes_written, + const CHAR *utf8_src, ULONG utf8_bytes) +{ + NTSTATUS status; + ULONG i, j; + ULONG written; + ULONG ch; + ULONG utf8_trail_bytes; + WCHAR utf16_ch[3]; + ULONG utf16_ch_len; + + if (!utf8_src) + return STATUS_INVALID_PARAMETER_4; + if (!uni_bytes_written) + return STATUS_INVALID_PARAMETER; + + written = 0; + status = STATUS_SUCCESS; + + for (i = 0; i < utf8_bytes; i++) + { + /* read UTF-8 lead byte */ + ch = (BYTE)utf8_src[i]; + utf8_trail_bytes = 0; + if (ch >= 0xf5) + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + else if (ch >= 0xf0) + { + ch &= 0x07; + utf8_trail_bytes = 3; + } + else if (ch >= 0xe0) + { + ch &= 0x0f; + utf8_trail_bytes = 2; + } + else if (ch >= 0xc2) + { + ch &= 0x1f; + utf8_trail_bytes = 1; + } + else if (ch >= 0x80) + { + /* overlong or trail byte */ + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + + /* read UTF-8 trail bytes */ + if (i + utf8_trail_bytes < utf8_bytes) + { + for (j = 0; j < utf8_trail_bytes; j++) + { + if ((utf8_src[i + 1] & 0xc0) == 0x80) + { + ch <<= 6; + ch |= utf8_src[i + 1] & 0x3f; + i++; + } + else + { + ch = 0xfffd; + utf8_trail_bytes = 0; + status = STATUS_SOME_NOT_MAPPED; + break; + } + } + } + else + { + ch = 0xfffd; + utf8_trail_bytes = 0; + status = STATUS_SOME_NOT_MAPPED; + i = utf8_bytes; + } + + /* encode ch as UTF-16 */ + if ((ch > 0x10ffff) || + (ch >= 0xd800 && ch <= 0xdfff) || + (utf8_trail_bytes == 2 && ch < 0x00800) || + (utf8_trail_bytes == 3 && ch < 0x10000)) + { + /* invalid codepoint or overlong encoding */ + utf16_ch[0] = 0xfffd; + utf16_ch[1] = 0xfffd; + utf16_ch[2] = 0xfffd; + utf16_ch_len = utf8_trail_bytes; + status = STATUS_SOME_NOT_MAPPED; + } + else if (ch >= 0x10000) + { + /* surrogate pair */ + ch -= 0x010000; + utf16_ch[0] = 0xd800 + (ch >> 10 & 0x3ff); + utf16_ch[1] = 0xdc00 + (ch >> 0 & 0x3ff); + utf16_ch_len = 2; + } + else + { + /* single unit */ + utf16_ch[0] = ch; + utf16_ch_len = 1; + } + + if (!uni_dest) + { + written += utf16_ch_len; + continue; + } + + for (j = 0; j < utf16_ch_len; j++) + { + if (uni_bytes_max >= sizeof(WCHAR)) + { + *uni_dest++ = utf16_ch[j]; + uni_bytes_max -= sizeof(WCHAR); + written++; + } + else + { + uni_bytes_max = 0; + status = STATUS_BUFFER_TOO_SMALL; + } + } + } + + *uni_bytes_written = written * sizeof(WCHAR); + return status; +} Propchange: trunk/reactos/lib/drivers/ntoskrnl_vista/rtl.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[tfaber] 71035: [DBGHELP] - Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo.

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 23 11:43:20 2016 New Revision: 71035 URL: http://svn.reactos.org/svn/reactos?rev=71035&view=rev Log: [DBGHELP] - Properly rename SYMBOL_INFO's member to Index, as done upstream. Dedicated to Timo. Modified: trunk/reactos/dll/win32/dbghelp/compat.h trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/dll/win32/dbghelp/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.h… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] Wed Mar 23 11:43:20 2016 @@ -680,7 +680,7 @@ ULONG SizeOfStruct; ULONG TypeIndex; ULONG64 Reserved[2]; - ULONG info; /* sdk states info, while MSDN says it's Index... */ + ULONG Index; ULONG Size; ULONG64 ModBase; ULONG Flags; Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Wed Mar 23 11:43:20 2016 @@ -572,7 +572,7 @@ if (!symt_get_info(pair->effective, sym, TI_GET_TYPE, &sym_info->TypeIndex)) sym_info->TypeIndex = 0; - sym_info->info = symt_ptr2index(pair->effective, sym); + sym_info->Index = symt_ptr2index(pair->effective, sym); sym_info->Reserved[0] = sym_info->Reserved[1] = 0; if (!symt_get_info(pair->effective, sym, TI_GET_LENGTH, &size) && (!sym_info->TypeIndex || @@ -731,7 +731,7 @@ const struct symt_function* func, const struct symt* sym) { symt_fill_sym_info(pair, func, sym, se->sym_info); - if (se->index && se->sym_info->info != se->index) return FALSE; + if (se->index && se->sym_info->Index != se->index) return FALSE; if (se->tag && se->sym_info->Tag != se->tag) return FALSE; if (se->addr && !(se->addr >= se->sym_info->Address && se->addr < se->sym_info->Address + se->sym_info->Size)) return FALSE; return !se->cb(se->sym_info, se->sym_info->Size, se->user); @@ -995,7 +995,7 @@ siw->TypeIndex = si->TypeIndex; siw->Reserved[0] = si->Reserved[0]; siw->Reserved[1] = si->Reserved[1]; - siw->Index = si->info; /* FIXME: see dbghelp.h */ + siw->Index = si->Index; siw->Size = si->Size; siw->ModBase = si->ModBase; siw->Flags = si->Flags; Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] Wed Mar 23 11:43:20 2016 @@ -460,7 +460,7 @@ { type = *(struct symt**)vector_at(&pair.effective->vtypes, i); sym_info->TypeIndex = symt_ptr2index(pair.effective, type); - sym_info->info = 0; /* FIXME */ + sym_info->Index = 0; /* FIXME */ symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); sym_info->Size = size; sym_info->ModBase = pair.requested->module.BaseOfImage; Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Wed Mar 23 11:43:20 2016 @@ -1065,10 +1065,7 @@ ULONG SizeOfStruct; ULONG TypeIndex; ULONG64 Reserved[2]; - union { - ULONG info; /* wrong, but wine needs it */ - ULONG Index; - }; + ULONG Index; ULONG Size; ULONG64 ModBase; ULONG Flags;

8 years, 9 months

[spetreolle] 71034: [SMSS] Less debug, better diagnostis.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Mar 22 18:34:18 2016 New Revision: 71034 URL: http://svn.reactos.org/svn/reactos?rev=71034&view=rev Log: [SMSS] Less debug, better diagnostis. Modified: trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c trunk/reactos/base/system/smss/smsbapi.c Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… ============================================================================== --- trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] Tue Mar 22 18:34:18 2016 @@ -317,7 +317,7 @@ } else { - DPRINT1("SMSS:PFILE: Deleted stale paging file - %wZ\n", FileName); + DPRINT("SMSS:PFILE: Deleted stale paging file - %wZ\n", FileName); } /* Close the handle */ @@ -1040,7 +1040,7 @@ if (!NT_SUCCESS(Status)) { /* We failed -- try again, with size minimization this time */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", + DPRINT("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Status = SmpCreateSystemManagedPagingFile(Descriptor, TRUE); } @@ -1063,7 +1063,7 @@ if (!NT_SUCCESS(Status)) { /* We failed to create it. Try again with a smaller size */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", + DPRINT("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Size.QuadPart = 16 * MEGABYTE; Status = SmpCreatePagingFileOnAnyDrive(Descriptor, Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Tue Mar 22 18:34:18 2016 @@ -361,7 +361,7 @@ if (Canary) { /* Save the data into the list */ - DPRINT1("Renamed file: '%S' - '%S'\n", Canary, ValueData); + DPRINT("Renamed file: '%S' - '%S'\n", Canary, ValueData); Status = SmpSaveRegistryValue(EntryContext, Canary, ValueData, FALSE); Canary = NULL; } @@ -2000,7 +2000,7 @@ /* Get this entry */ NextEntry = RemoveHeadList(Head); RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Processing PFRO: '%wZ' / '%wZ'\n", &RegEntry->Value, &RegEntry->Name); + DPRINT("Processing PFRO: '%wZ' / '%wZ'\n", &RegEntry->Value, &RegEntry->Name); /* Skip past the '@' marker */ if (!(RegEntry->Value.Length) && (*RegEntry->Name.Buffer == L'@')) @@ -2083,7 +2083,7 @@ Buffer->ReplaceIfExists) { /* Open the file for write attribute access this time... */ - DPRINT1("\nSMSS: '%wZ' => '%wZ' failed - Status == %x, Possible readonly target\n", + DPRINT("\nSMSS: '%wZ' => '%wZ' failed - Status == %x, Possible readonly target\n", &RegEntry->Name, &RegEntry->Value, STATUS_OBJECT_NAME_COLLISION); @@ -2110,7 +2110,7 @@ else { /* Now remove the read-only attribute from the file */ - DPRINT1(" SMSS: Open Existing Success\n"); + DPRINT(" SMSS: Open Existing Success\n"); RtlZeroMemory(&BasicInfo, sizeof(BasicInfo)); BasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; Status = NtSetInformationFile(FileHandle, @@ -2128,7 +2128,7 @@ else { /* Now that the file is no longer read-only, delete! */ - DPRINT1(" SMSS: Set To NORMAL OK\n"); + DPRINT(" SMSS: Set To NORMAL OK\n"); Status = NtSetInformationFile(OtherFileHandle, &IoStatusBlock, Buffer, @@ -2143,7 +2143,7 @@ else { /* Everything ok */ - DPRINT1(" SMSS: Re-Rename Worked OK\n"); + DPRINT(" SMSS: Re-Rename Worked OK\n"); } } } @@ -2162,12 +2162,12 @@ else if (RegEntry->Value.Length) { /* We succeed with a rename */ - DPRINT1("SMSS: '%wZ' (renamed to) '%wZ'\n", &RegEntry->Name, &RegEntry->Value); + DPRINT("SMSS: '%wZ' (renamed to) '%wZ'\n", &RegEntry->Name, &RegEntry->Value); } else { /* We suceeded with a delete */ - DPRINT1("SMSS: '%wZ' (deleted)\n", &RegEntry->Name); + DPRINT("SMSS: '%wZ' (deleted)\n", &RegEntry->Name); } /* Now free this entry and keep going */ @@ -2242,7 +2242,7 @@ } /* Print out if this is the case */ - if (MiniNTBoot) DPRINT1("SMSS: !!! MiniNT Boot !!!\n"); + if (MiniNTBoot) DPRINT("SMSS: !!! MiniNT Boot !!!\n"); /* Open the environment key to see if we are booted in safe mode */ RtlInitUnicodeString(&DestinationString, Modified: trunk/reactos/base/system/smss/smsbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsbapi.c… ============================================================================== --- trunk/reactos/base/system/smss/smsbapi.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsbapi.c [iso-8859-1] Tue Mar 22 18:34:18 2016 @@ -179,7 +179,7 @@ #endif /* This is a native application being started as the initial command */ - DPRINT1("Subsystem active, starting thread\n"); + DPRINT("Subsystem active, starting thread\n"); NtClose(ProcessInformation->ProcessHandle); NtResumeThread(ProcessInformation->ThreadHandle, NULL); NtClose(ProcessInformation->ThreadHandle);

8 years, 9 months

[akhaldi] 71033: [README.WINE] Mark some modules as synced with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 21 16:28:41 2016 New Revision: 71033 URL: http://svn.reactos.org/svn/reactos?rev=71033&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 21 16:28:41 2016 @@ -228,22 +228,22 @@ ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.4 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.4 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.55 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.55 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.55 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.55 -reactos/base/applications/games/winmine # Synced to WineStaging-1.7.55 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.7.55 -reactos/base/applications/iexplore # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.4 +reactos/base/applications/games/winmine # Synced to WineStaging-1.9.4 with our own resources. +reactos/base/applications/extrac32 # Synced to WineStaging-1.9.4 +reactos/base/applications/iexplore # Synced to WineStaging-1.9.4 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.4 -reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 -reactos/base/services/rpcss # Synced to WineStaging-1.7.55 +reactos/base/applications/wordpad # Synced to WineStaging-1.9.4 +reactos/base/services/rpcss # Synced to WineStaging-1.9.4 reactos/base/shell/progman # Synced to WineStaging-1.9.4 -reactos/base/system/expand # Synced to WineStaging-1.7.55 +reactos/base/system/expand # Synced to WineStaging-1.9.4 reactos/base/system/msiexec # Synced to WineStaging-1.9.4 reactos/modules/rosapps/winfile # Autosync

8 years, 9 months

[pschweitzer] 71032: [NTOSKRNL] Fix build. Seriously... GCC, you allow this?!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 19:30:43 2016 New Revision: 71032 URL: http://svn.reactos.org/svn/reactos?rev=71032&view=rev Log: [NTOSKRNL] Fix build. Seriously... GCC, you allow this?! Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=7103… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sun Mar 20 19:30:43 2016 @@ -252,7 +252,7 @@ return; } - return CcUnpinData(Bcb); + CcUnpinData(Bcb); } /*

8 years, 9 months

[pschweitzer] 71031: [EXT2] Update the driver to release 0.63. One notable change is support for ExtX links (hard/sym). They work out of the box due to all the previous work that was done for suppo...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 18:36:38 2016 New Revision: 71031 URL: http://svn.reactos.org/svn/reactos?rev=71031&view=rev Log: [EXT2] Update the driver to release 0.63. One notable change is support for ExtX links (hard/sym). They work out of the box due to all the previous work that was done for supporting reparse points on NTFS. Full changelog available at: http://www.ext2fsd.com/?p=195 CORE-10996 #resolve #comment Commited in r71031 Added: trunk/reactos/drivers/filesystems/ext2/src/access.c (with props) Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs_sb.h trunk/reactos/drivers/filesystems/ext2/inc/linux/ext4_ext.h trunk/reactos/drivers/filesystems/ext2/inc/linux/fs.h trunk/reactos/drivers/filesystems/ext2/inc/linux/jbd.h trunk/reactos/drivers/filesystems/ext2/inc/linux/module.h trunk/reactos/drivers/filesystems/ext2/inc/linux/rbtree.h trunk/reactos/drivers/filesystems/ext2/src/cleanup.c trunk/reactos/drivers/filesystems/ext2/src/close.c trunk/reactos/drivers/filesystems/ext2/src/create.c trunk/reactos/drivers/filesystems/ext2/src/debug.c trunk/reactos/drivers/filesystems/ext2/src/dirctl.c trunk/reactos/drivers/filesystems/ext2/src/ext3/generic.c trunk/reactos/drivers/filesystems/ext2/src/ext3/htree.c trunk/reactos/drivers/filesystems/ext2/src/ext3/recover.c trunk/reactos/drivers/filesystems/ext2/src/ext4/ext4_bh.c trunk/reactos/drivers/filesystems/ext2/src/ext4/ext4_extents.c trunk/reactos/drivers/filesystems/ext2/src/ext4/extents.c trunk/reactos/drivers/filesystems/ext2/src/fastio.c trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c trunk/reactos/drivers/filesystems/ext2/src/flush.c trunk/reactos/drivers/filesystems/ext2/src/fsctl.c trunk/reactos/drivers/filesystems/ext2/src/init.c trunk/reactos/drivers/filesystems/ext2/src/jbd/replay.c trunk/reactos/drivers/filesystems/ext2/src/jbd/revoke.c trunk/reactos/drivers/filesystems/ext2/src/linux.c trunk/reactos/drivers/filesystems/ext2/src/lock.c trunk/reactos/drivers/filesystems/ext2/src/memory.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/pnp.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/volinfo.c trunk/reactos/drivers/filesystems/ext2/src/write.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/C… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs_sb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/ext4_ext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/jbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/module.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Added: trunk/reactos/drivers/filesystems/ext2/src/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext3/generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext3/htree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext3/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext4/ext4_bh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext4/ext4_extents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext4/extents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/jbd/replay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/jbd/revoke.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…

8 years, 9 months

[pschweitzer] 71030: [NTOSKRNL] Implement in a really simple way CcSetBcbOwnerPointer() and CcUnpinDataForThread(). They don't do everything the Windows Cc does, but at least, they do the basic job...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 18:33:54 2016 New Revision: 71030 URL: http://svn.reactos.org/svn/reactos?rev=71030&view=rev Log: [NTOSKRNL] Implement in a really simple way CcSetBcbOwnerPointer() and CcUnpinDataForThread(). They don't do everything the Windows Cc does, but at least, they do the basic job. CORE-10996 Modified: trunk/reactos/ntoskrnl/cc/cacheman.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sun Mar 20 18:33:54 2016 @@ -117,10 +117,14 @@ IN PVOID Owner ) { + PINTERNAL_BCB iBcb = Bcb; + CCTRACE(CC_API_DEBUG, "Bcb=%p Owner=%p\n", Bcb, Owner); - UNIMPLEMENTED; + if (iBcb->OwnerPointer) + DPRINT1("OwnerPointer was already set?! Old: %p, New: %p\n", iBcb->OwnerPointer, Owner); + iBcb->OwnerPointer = Owner; } /* Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=7103… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sun Mar 20 18:33:54 2016 @@ -242,9 +242,17 @@ IN PVOID Bcb, IN ERESOURCE_THREAD ResourceThreadId) { + PINTERNAL_BCB iBcb = Bcb; + CCTRACE(CC_API_DEBUG, "Bcb=%p ResourceThreadId=%lu\n", Bcb, ResourceThreadId); - UNIMPLEMENTED; + if (iBcb->OwnerPointer != (PVOID)ResourceThreadId) + { + DPRINT1("Invalid owner! Caller: %p, Owner: %p\n", (PVOID)ResourceThreadId, iBcb->OwnerPointer); + return; + } + + return CcUnpinData(Bcb); } /* Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Mar 20 18:33:54 2016 @@ -194,6 +194,7 @@ PROS_VACB Vacb; BOOLEAN Dirty; CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ + PVOID OwnerPointer; } INTERNAL_BCB, *PINTERNAL_BCB; VOID

8 years, 9 months

[tkreuzer] 71029: [PSDK] "Fix" _SYMBOL_INFO structure, by replacing "info" member with a union of Index (correct member name) and info (required by wine code)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 20 17:11:49 2016 New Revision: 71029 URL: http://svn.reactos.org/svn/reactos?rev=71029&view=rev Log: [PSDK] "Fix" _SYMBOL_INFO structure, by replacing "info" member with a union of Index (correct member name) and info (required by wine code) Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sun Mar 20 17:11:49 2016 @@ -1065,7 +1065,10 @@ ULONG SizeOfStruct; ULONG TypeIndex; ULONG64 Reserved[2]; - ULONG info; /* sdk states info, while MSDN says it's Index... */ + union { + ULONG info; /* wrong, but wine needs it */ + ULONG Index; + }; ULONG Size; ULONG64 ModBase; ULONG Flags;

8 years, 9 months

[pschweitzer] 71028: [NTDLL_APITEST] RtlGenerate8dot3Name: add more test locales

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 11:31:42 2016 New Revision: 71028 URL: http://svn.reactos.org/svn/reactos?rev=71028&view=rev Log: [NTDLL_APITEST] RtlGenerate8dot3Name: add more test locales Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGenerat… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] Sun Mar 20 11:31:42 2016 @@ -20,12 +20,42 @@ _Inout_ PGENERATE_NAME_CONTEXT Context, _Inout_ PUNICODE_STRING Name8dot3); -PWSTR Names[] = { L"Menu DÃ©marrer", L"SÃ©lecteur de configuration clavier.lnk", L"Ã©Ã¨Ã Ã¹Ã§.txt", L"Ã§Ã¹Ã Ã¨Ã©.txt", L"Ã©Ã¨Ã Ã¹.txt", L"Ã§Ã¹Ã Ã¨.txt", L"Ã©Ã¨Ã Ã¹Ã§eeauc.txt", L"Ã©eÃ¨Ã©Ã§cÃ¹u.txt", L"test.Ã©xÃ¨", L"tÂ£$tÂ¤.txt", L"Long file name.txt", L"Long file name", L"Longfilename.txt", L"Longfilename" }; -PWSTR ShortNames1[] = { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT", L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X", L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; -PWSTR ShortNames2[] = { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; -PWSTR ExShortNames1[] = { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"ÃEÃÃÃC~1.TXT", L"TEST~1.ÃXÃ", L"TÂ£$TÂ¤~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; -PWSTR ExShortNames2[] = { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"ÃEÃÃÃC~2.TXT", L"TEST~2.ÃXÃ", L"TÂ£$TÂ¤~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; - +#define NAMES_COUNT 14 +#define LOCALES_COUNT 3 + +PWSTR Names[NAMES_COUNT] = { L"Menu DÃ©marrer", L"SÃ©lecteur de configuration clavier.lnk", L"Ã©Ã¨Ã Ã¹Ã§.txt", L"Ã§Ã¹Ã Ã¨Ã©.txt", L"Ã©Ã¨Ã Ã¹.txt", L"Ã§Ã¹Ã Ã¨.txt", L"Ã©Ã¨Ã Ã¹Ã§eeauc.txt", L"Ã©eÃ¨Ã©Ã§cÃ¹u.txt", L"test.Ã©xÃ¨", L"tÂ£$tÂ¤.txt", L"Long file name.txt", L"Long file name", L"Longfilename.txt", L"Longfilename" }; +PWSTR ShortNames1[LOCALES_COUNT][NAMES_COUNT] = +{ + { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT", L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X", L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, + { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT", L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X", L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, + { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT", L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X", L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, +}; +PWSTR ShortNames2[LOCALES_COUNT][NAMES_COUNT] = +{ + { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, + { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, + { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, +}; +PWSTR ExShortNames1[LOCALES_COUNT][NAMES_COUNT] = +{ + { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"ÃEÃÃÃC~1.TXT", L"TEST~1.ÃXÃ", L"TÂ£$TÂ¤~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, + { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"ÃEÃÃÃC~1.TXT", L"TEST~1.ÃXÃ", L"TÂ£$T_~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, + { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃCAU~1.TXT", L"UACÃ~1.TXT", L"ÃCAU~1.TXT", L"UAC~1.TXT", L"ÃCAUEE~1.TXT", L"ÃECÃCU~1.TXT", L"TEST~1.ÃXC", L"TÂ£$TÂ¤~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }, +}; +PWSTR ExShortNames2[LOCALES_COUNT][NAMES_COUNT] = +{ + { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"ÃEÃÃÃC~2.TXT", L"TEST~2.ÃXÃ", L"TÂ£$TÂ¤~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, + { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"ÃEÃÃÃC~2.TXT", L"TEST~2.ÃXÃ", L"TÂ£$T_~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, + { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃCAU~2.TXT", L"UACÃ~2.TXT", L"ÃCAU~2.TXT", L"UAC~2.TXT", L"ÃCAUEE~2.TXT", L"ÃECÃCU~2.TXT", L"TEST~2.ÃXC", L"TÂ£$TÂ¤~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }, +}; + +ULONG Locales[LOCALES_COUNT][2] = +{ + {1252, 850}, // Most used for latin langs + {1252, 437}, // Used for English US (not only) + {1252, 775}, // Used for Estonian +}; + PVOID LoadCodePageData(ULONG Code) { char filename[MAX_PATH], sysdir[MAX_PATH]; @@ -71,41 +101,44 @@ START_TEST(RtlGenerate8dot3Name) { - USHORT i; + USHORT i, j; - /* Set a french locale. */ - SetupLocale(1252, 850, -1); + for (j = 0; j < LOCALES_COUNT; ++j) + { + /* Setup locale. */ + SetupLocale(Locales[j][0], Locales[j][1], -1); - for (i = 0; i < 14; ++i) - { - WCHAR Buffer[12]; - GENERATE_NAME_CONTEXT Context; - UNICODE_STRING LongName, ShortName, Expected; + for (i = 0; i < NAMES_COUNT; ++i) + { + WCHAR Buffer[12]; + GENERATE_NAME_CONTEXT Context; + UNICODE_STRING LongName, ShortName, Expected; - RtlZeroMemory(&Context, sizeof(GENERATE_NAME_CONTEXT)); - RtlInitUnicodeString(&LongName, Names[i]); - ShortName.Buffer = Buffer; - ShortName.Length = 0; - ShortName.MaximumLength = sizeof(Buffer); + RtlZeroMemory(&Context, sizeof(GENERATE_NAME_CONTEXT)); + RtlInitUnicodeString(&LongName, Names[i]); + ShortName.Buffer = Buffer; + ShortName.Length = 0; + ShortName.MaximumLength = sizeof(Buffer); - RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName); - RtlInitUnicodeString(&Expected, ShortNames1[i]); - ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "Generated: %.*S. Expected: %.*S\n", ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); + RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName); + RtlInitUnicodeString(&Expected, ShortNames1[j][i]); + ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u:: Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); - ShortName.Length = 0; - RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName); - RtlInitUnicodeString(&Expected, ShortNames2[i]); - ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "Generated: %.*S. Expected: %.*S\n", ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); + ShortName.Length = 0; + RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName); + RtlInitUnicodeString(&Expected, ShortNames2[j][i]); + ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u:: Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); - RtlZeroMemory(&Context, sizeof(GENERATE_NAME_CONTEXT)); - ShortName.Length = 0; - RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName); - RtlInitUnicodeString(&Expected, ExShortNames1[i]); - ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "Generated: %.*S. Expected: %.*S\n", ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); + RtlZeroMemory(&Context, sizeof(GENERATE_NAME_CONTEXT)); + ShortName.Length = 0; + RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName); + RtlInitUnicodeString(&Expected, ExShortNames1[j][i]); + ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u:: Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); - ShortName.Length = 0; - RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName); - RtlInitUnicodeString(&Expected, ExShortNames2[i]); - ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "Generated: %.*S. Expected: %.*S\n", ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); + ShortName.Length = 0; + RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName); + RtlInitUnicodeString(&Expected, ExShortNames2[j][i]); + ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u:: Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR), ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer); + } } }

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016