Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [KMTESTS:CC] Add a test to show we map our buffers wrong in CC
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d04c691af4f2035074d1… commit 5d04c691af4f2035074d1689744a986dea77902b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:29:59 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:29:59 2018 +0200 [KMTESTS:CC] Add a test to show we map our buffers wrong in CC That is expected (cf. CORE-14259) --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 6eded83e21..e067124ee2 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -255,6 +255,19 @@ PerformTest( { PKTHREAD ThreadHandle; +#ifdef _X86_ + /* FIXME: Should be fixed, will fail under certains conditions */ + ok(TestContext->Buffer > (PVOID)0xC1000000 && TestContext->Buffer < (PVOID)0xDCFFFFFF, + "Buffer %p not mapped in system space\n", TestContext->Buffer); +#else +#ifdef _M_AMD64 + ok(TestContext->Buffer > (PVOID)0xFFFFF98000000000 && TestContext->Buffer < (PVOID)0xFFFFFA8000000000, + "Buffer %p not mapped in system space\n", TestContext->Buffer); +#else + skip(FALSE, "System space mapping not defined\n"); +#endif +#endif + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL);

1 0

03/03: [KMTESTS:CC] Remove dummy leftover
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b9b4c48c9a9adde6f899… commit 1b9b4c48c9a9adde6f8993975ba6fc25daf78542 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:08:25 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:08:25 2018 +0200 [KMTESTS:CC] Remove dummy leftover --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 415eb148a3..6eded83e21 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -263,9 +263,7 @@ PerformTest( ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL); - TestTestId = -1; CcUnpinData(TestContext->Bcb); - TestTestId = 3; } ExFreePool(TestContext);

1 0

02/03: [KMTESTS:CC] Extended previous test to show an overlap is enough
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=262e5bfef1fc853e2c3c7… commit 262e5bfef1fc853e2c3c71cbf046cff75fae415f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:07:46 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:07:46 2018 +0200 [KMTESTS:CC] Extended previous test to show an overlap is enough --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 7cf442e628..415eb148a3 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -24,6 +24,7 @@ typedef struct _TEST_CONTEXT { PVOID Bcb; PVOID Buffer; + ULONG Length; } TEST_CONTEXT, *PTEST_CONTEXT; static BOOLEAN TestMap = FALSE; @@ -162,12 +163,13 @@ MapInAnotherThread(IN PVOID Context) ok(TestContext != NULL, "Called in invalid context!\n"); ok(TestContext->Bcb != NULL, "Called in invalid context!\n"); ok(TestContext->Buffer != NULL, "Called in invalid context!\n"); + ok(TestContext->Length != 0, "Called in invalid context!\n"); Ret = FALSE; Offset.QuadPart = 0x1000; KmtStartSeh(); TestMap = TRUE; - Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); TestMap = FALSE; KmtEndSeh(STATUS_SUCCESS); @@ -253,6 +255,11 @@ PerformTest( { PKTHREAD ThreadHandle; + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; + ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); + KmtFinishThread(ThreadHandle, NULL); + + TestContext->Length = FileSizes.FileSize.QuadPart - 2 * Offset.QuadPart; ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL);

1 0

01/03: [KMTESTS:CC] Add a test that shows that our CC implementation duplicates BCB
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad0c93b001a0de6085db9… commit ad0c93b001a0de6085db90723b11d1613cba41f5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:01:06 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:01:06 2018 +0200 [KMTESTS:CC] Add a test that shows that our CC implementation duplicates BCB It should instead reuse BCBs when mapping something already mapped. --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 98 ++++++++++++++++++++--- modules/rostests/kmtests/ntos_cc/CcMapData_user.c | 5 +- 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index b4e632ec32..7cf442e628 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -20,6 +20,13 @@ typedef struct _TEST_FCB FAST_MUTEX HeaderMutex; } TEST_FCB, *PTEST_FCB; +typedef struct _TEST_CONTEXT +{ + PVOID Bcb; + PVOID Buffer; +} TEST_CONTEXT, *PTEST_CONTEXT; + +static BOOLEAN TestMap = FALSE; static ULONG TestTestId = -1; static PFILE_OBJECT TestFileObject; static PDEVICE_OBJECT TestDeviceObject; @@ -137,6 +144,44 @@ MapAndLockUserBuffer( return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); } +static +VOID +NTAPI +MapInAnotherThread(IN PVOID Context) +{ + BOOLEAN Ret; + PULONG Buffer; + PVOID Bcb; + LARGE_INTEGER Offset; + PTEST_CONTEXT TestContext; + + ok(TestFileObject != NULL, "Called in invalid context!\n"); + ok_eq_ulong(TestTestId, 3); + + TestContext = Context; + ok(TestContext != NULL, "Called in invalid context!\n"); + ok(TestContext->Bcb != NULL, "Called in invalid context!\n"); + ok(TestContext->Buffer != NULL, "Called in invalid context!\n"); + + Ret = FALSE; + Offset.QuadPart = 0x1000; + KmtStartSeh(); + TestMap = TRUE; + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + TestMap = FALSE; + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + + return; +} + static VOID PerformTest( @@ -174,17 +219,50 @@ PerformTest( if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) { - Ret = FALSE; - Offset.QuadPart = TestId * 0x1000; - KmtStartSeh(); - Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); - KmtEndSeh(STATUS_SUCCESS); - - if (!skip(Ret == TRUE, "CcMapData failed\n")) + if (TestId < 3) { - ok_eq_ulong(Buffer[(0x3000 - TestId * 0x1000) / sizeof(ULONG)], 0xDEADBABE); - - CcUnpinData(Bcb); + Ret = FALSE; + Offset.QuadPart = TestId * 0x1000; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(0x3000 - TestId * 0x1000) / sizeof(ULONG)], 0xDEADBABE); + + CcUnpinData(Bcb); + } + } + else if (TestId == 3) + { + PTEST_CONTEXT TestContext; + + TestContext = ExAllocatePool(NonPagedPool, sizeof(TEST_CONTEXT)); + if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + { + Ret = FALSE; + Offset.QuadPart = 0x1000; + KmtStartSeh(); + TestMap = TRUE; + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &TestContext->Bcb, &TestContext->Buffer); + TestMap = FALSE; + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + PKTHREAD ThreadHandle; + + ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); + KmtFinishThread(ThreadHandle, NULL); + + TestTestId = -1; + CcUnpinData(TestContext->Bcb); + TestTestId = 3; + } + + ExFreePool(TestContext); + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c index 31847c0e89..b1d2685f76 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c @@ -18,7 +18,10 @@ START_TEST(CcMapData) KmtLoadDriver(L"CcMapData", FALSE); KmtOpenDriver(); - for (TestId = 0; TestId < 3; ++TestId) + /* 3 tests for offset + * 1 test for BCB + */ + for (TestId = 0; TestId < 4; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

02/02: [NTOSKRNL] Fix a typo
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0eb39084e43341ebc7af… commit f0eb39084e43341ebc7afe08ff6c749e75189a87 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 19:48:03 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 19:48:32 2018 +0200 [NTOSKRNL] Fix a typo --- ntoskrnl/cc/pin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 7373981119..3843cb2693 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -177,7 +177,7 @@ CcPinMappedData ( PINTERNAL_BCB iBcb; PROS_SHARED_CACHE_MAP SharedCacheMap; - CCTRACE(CC_API_DEBUG, "FileOffset=%p FileOffset=%p Length=%lu Flags=0x%lx\n", + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx\n", FileObject, FileOffset, Length, Flags); ASSERT(FileObject);

1 0

01/02: [NTOSKRNL] Warn about unimplemented feature in CcMapData() (in all callers)
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e806d16b065c5db27206d… commit e806d16b065c5db27206d69f76a724ce593659bc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 19:43:04 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 19:48:32 2018 +0200 [NTOSKRNL] Warn about unimplemented feature in CcMapData() (in all callers) Currently, our CcMapData() behavior (same goes for CcPinRead()) is broken and is the total opposite of what Windows kernel does. By default, the later will let you map a view in memory without even attempting to bring its data in memory. On first access, there will be a fault and memory will be read from the hardware and brought to memory. If you want to force read on mapping/pinning, you have to set the MAP_NO_READ (or PIN_NO_READ) flag where kernel will fault on your behalf (hence the need for MAP_WAIT/PIN_WAIT). On ReactOS, by default, on mapping (and thus pinning), we will force a view read so that data is in memory. The way our cache memory is managed at the moment seems not to allow to fault on invalid access and if we don't force read, the memory content will just be zeroed. So trying to match Windows behavior, by default, now CcMapData() will enforce the MAP_NO_READ flag and warn once about this behavior change. --- ntoskrnl/cc/pin.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 65525eed83..7373981119 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -86,6 +86,18 @@ CcMapData ( return FALSE; } + if (!BooleanFlagOn(Flags, MAP_NO_READ)) + { + static int Warned = 0; + + SetFlag(Flags, MAP_NO_READ); + if (!Warned) + { + DPRINT1("Mapping/pinning with no read not implemented. Forcing read, might fail if wait not allowed\n"); + Warned++; + } + } + ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); Status = CcRosRequestVacb(SharedCacheMap, ROffset, @@ -100,9 +112,9 @@ CcMapData ( return FALSE; } - if (!Valid) + if (!Valid && BooleanFlagOn(Flags, MAP_NO_READ)) { - if (!(Flags & MAP_WAIT)) + if (!BooleanFlagOn(Flags, MAP_WAIT)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n",

1 0

01/01: [KMTESTS] Re-enable kmtest_.exe installation (#389)
by Serge Gautherie 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f65f3a51d106ac046a09… commit 3f65f3a51d106ac046a092f9a851d6570fe21a87 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Aug 31 08:46:48 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Fri Aug 31 08:46:48 2018 +0200 [KMTESTS] Re-enable kmtest_.exe installation (#389) ExPools and other tests don't break Windows Server 2003 anymore. Revert r73535, so KmTests run on "Test WHS" bot. CORE-12657 --- modules/rostests/kmtests/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index bcc95c5e91..8c844534dd 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -155,8 +155,7 @@ add_importlibs(kmtest fltlib advapi32 ws2_32 msvcrt kernel32 ntdll) add_target_compile_definitions(kmtest KMT_USER_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") -#add_rostests_file(TARGET kmtest) -add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) +add_rostests_file(TARGET kmtest) # # Group targets

1 0

01/01: [MODULES] Order the cmake inclusions alphabetically as we're used to everywhere else.
by Hermès Bélusca-Maïto 30 Aug '18

30 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1383fb0514700b318839d… commit 1383fb0514700b318839da0eee626ef125d06631 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 30 22:54:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 30 22:54:49 2018 +0200 [MODULES] Order the cmake inclusions alphabetically as we're used to everywhere else. --- modules/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index e09868d033..78123b6aed 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,12 +1,12 @@ -if(ENABLE_ROSTESTS) - add_subdirectory(rostests) -endif() - if(ENABLE_ROSAPPS) add_subdirectory(rosapps) endif() +if(ENABLE_ROSTESTS) + add_subdirectory(rostests) +endif() + if(ENABLE_WALLPAPERS) add_subdirectory(wallpapers) endif()

1 0

01/01: [REACTOS] Introduce a "DEBUGFORMAT" environment variable that allows to select different debug trace formats. CORE-12671
by Hermès Bélusca-Maïto 30 Aug '18

30 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb979bb29316ebe476022… commit cb979bb29316ebe476022efe9cc7b2f40535982b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 5 21:15:08 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 30 22:42:50 2018 +0200 [REACTOS] Introduce a "DEBUGFORMAT" environment variable that allows to select different debug trace formats. CORE-12671 - The default format is used when no format name is specified: this is the one we use so far in ReactOS: <debug_class>:(<file>:<line>) <message> with "debug_class" being "trace", "warn", "err". - The "wine" format is the one used by Wine. It can be used when trying to diff-compare traces for a module with the corresponding one obtained from a Wine run. It can also be useful because the logging of Wine-synced code assumes that the function names are automatically added by the helper macros "FIXME()", "TRACE()", "WARN()" or "ERR()", and not manually inside the logging string given to these macros: for example: FIXME("(%params) message\n", params); displays: fixme:<module>:SomeFunc(params) message - The "extended" (or "ext") format is very noisy and tries to output a lot of information; it is a hybrid of the previous two formats: <debug_class>:(<file>:<line>):<channel>:SomeFunc <message> Support for displaying the current process ID is added in addition to the already existing support for thread ID. --- sdk/include/reactos/wine/debug.h | 2 +- sdk/lib/3rdparty/libwine/debug.c | 112 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/wine/debug.h b/sdk/include/reactos/wine/debug.h index cd366ab375..35aefc9852 100644 --- a/sdk/include/reactos/wine/debug.h +++ b/sdk/include/reactos/wine/debug.h @@ -141,7 +141,7 @@ struct __wine_debug_channel #define __WINE_DPRINTF(dbcl,dbch) \ (!__WINE_GET_DEBUGGING(dbcl,(dbch)) || \ - (ros_dbg_log(__WINE_DBCL##dbcl,(dbch),__FILE__,"",__LINE__,"") == -1)) ? \ + (ros_dbg_log(__WINE_DBCL##dbcl,(dbch),__RELFILE__,__FUNCTION__,__LINE__,"") == -1)) ? \ (void)0 : (void)wine_dbg_printf #define __WINE_PRINTF_ATTR(fmt, args) diff --git a/sdk/lib/3rdparty/libwine/debug.c b/sdk/lib/3rdparty/libwine/debug.c index dbcce115d2..9c6eba2c77 100644 --- a/sdk/lib/3rdparty/libwine/debug.c +++ b/sdk/lib/3rdparty/libwine/debug.c @@ -35,6 +35,7 @@ #include <rtlfuncs.h> #include <cmfuncs.h> +WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(tid); ULONG @@ -59,6 +60,18 @@ static struct __wine_debug_functions funcs; static void debug_init(void); + +/* Wine format */ +static int winefmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ); +/* ReactOS format (default) */ +static int rosfmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ); +/* Extended format */ +static int extfmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ); + + static int __cdecl cmp_name( const void *p1, const void *p2 ) { const char *name = p1; @@ -184,6 +197,25 @@ static void parse_options( const char *str ) free( options ); } +/* + * The syntax of the DEBUGCHANNEL environment variable is: + * DEBUGCHANNEL=[class]+xxx,[class]-yyy,... + * + * For example: DEBUGCHANNEL=+all,warn-heap + * turns on all messages except warning heap messages. + * + * The available message classes are: err, warn, fixme, trace. + * + * In order to select a different debug trace format, the + * DEBUGFORMAT environment variable should be used: + * + * DEBUGFORMAT=fmt + * + * where fmt is the format name: 'wine', or 'extended' (abbreviation: 'ext'). + * If no format or an invalid one is specified, the fall-back default format + * is used instead. + */ + /* initialize all options at startup */ static void debug_init(void) { @@ -206,6 +238,34 @@ static void debug_init(void) free(wine_debug); } } + + dwLength = GetEnvironmentVariableA("DEBUGFORMAT", NULL, 0); + if (dwLength) + { + wine_debug = malloc(dwLength); + if (wine_debug) + { + if (GetEnvironmentVariableA("DEBUGFORMAT", wine_debug, dwLength) < dwLength) + { + if (strcmp(wine_debug, "wine") == 0) + { + funcs.dbg_vlog = winefmt_default_dbg_vlog; + } + else + if (strcmp(wine_debug, "extended") == 0 || + strcmp(wine_debug, "ext") == 0) + { + funcs.dbg_vlog = extfmt_default_dbg_vlog; + } + else + { + funcs.dbg_vlog = rosfmt_default_dbg_vlog; + } + } + free(wine_debug); + } + } + SetLastError(LastError); } @@ -413,19 +473,36 @@ static int default_dbg_vprintf( const char *format, va_list args ) /* default implementation of wine_dbg_vlog */ -static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *file, const char *func, const int line, const char *format, va_list args ) +/* Wine format */ +static int winefmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ) +{ + int ret = 0; + + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess) ); + ret += wine_dbg_printf( "%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueThread) ); + + if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + if (format) + ret += funcs.dbg_vprintf( format, args ); + return ret; +} +/* ReactOS format (default) */ +static int rosfmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ) { int ret = 0; if (TRACE_ON(tid)) - ret += wine_dbg_printf("%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueThread)); + ret += wine_dbg_printf( "%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueThread) ); if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:", debug_classes[cls] ); if (file && line) - ret += wine_dbg_printf ( "(%s:%d) ", file, line ); + ret += wine_dbg_printf( "(%s:%d) ", file, line ); else ret += wine_dbg_printf( "%s:%s: ", channel->name, func ); @@ -433,6 +510,31 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += funcs.dbg_vprintf( format, args ); return ret; } +/* Extended format */ +static int extfmt_default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ) +{ + int ret = 0; + + if (TRACE_ON(pid) || TRACE_ON(tid)) + { + ret += wine_dbg_printf( "[%04x:%04x]:", + (TRACE_ON(pid) ? HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess) : 0), + (TRACE_ON(tid) ? HandleToULong(NtCurrentTeb()->ClientId.UniqueThread) : 0) ); + } + + if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + ret += wine_dbg_printf( "%s:", debug_classes[cls] ); + + if (file && line) + ret += wine_dbg_printf( "(%s:%d):", file, line ); + + ret += wine_dbg_printf( "%s:%s ", channel->name, func ); + + if (format) + ret += funcs.dbg_vprintf( format, args ); + return ret; +} /* wrappers to use the function pointers */ @@ -460,5 +562,5 @@ static struct __wine_debug_functions funcs = default_dbgstr_an, default_dbgstr_wn, default_dbg_vprintf, - default_dbg_vlog + rosfmt_default_dbg_vlog };

1 0

01/01: [WIN32SS][FONT] Fix GetTextFace function and related (#829)
by Katayama Hirofumi MZ 30 Aug '18

30 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8749d379beeb3a078c29… commit c8749d379beeb3a078c296feca1f4cdb3e9d11f1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 30 21:34:03 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 30 14:34:03 2018 +0200 [WIN32SS][FONT] Fix GetTextFace function and related (#829) Google Chrome with -no-sandbox parameter in ReactOS wouldn't display the web page because first-chance exception raised. CORE-14926 - Remove FullName, Style, and FaceName members from TEXTOBJ structure. - Add TextFace member into TEXTOBJ structure. - Add MatchFontName() and MatchFontNames() helper functions. - Fix GetTextFace() and related. --- win32ss/gdi/ntgdi/freetype.c | 75 ++++++++++++++++++++++++++++++++++++++------ win32ss/gdi/ntgdi/text.c | 4 +-- win32ss/gdi/ntgdi/text.h | 4 +-- 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5275b36576..e172c5c537 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4667,6 +4667,53 @@ IntFontType(PFONTGDI Font) } } +static BOOL +MatchFontName(PSHARED_FACE SharedFace, LPCWSTR lfFaceName, FT_UShort NameID, FT_UShort LangID) +{ + NTSTATUS Status; + UNICODE_STRING Name1, Name2; + + if (lfFaceName[0] == UNICODE_NULL) + return FALSE; + + RtlInitUnicodeString(&Name1, lfFaceName); + + RtlInitUnicodeString(&Name2, NULL); + Status = IntGetFontLocalizedName(&Name2, SharedFace, NameID, LangID); + + if (NT_SUCCESS(Status)) + { + if (RtlCompareUnicodeString(&Name1, &Name2, TRUE) == 0) + { + RtlFreeUnicodeString(&Name2); + return TRUE; + } + + RtlFreeUnicodeString(&Name2); + } + + return FALSE; +} + +static BOOL +MatchFontNames(PSHARED_FACE SharedFace, LPCWSTR lfFaceName) +{ + if (MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FONT_FAMILY, LANG_ENGLISH) || + MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FULL_NAME, LANG_ENGLISH)) + { + return TRUE; + } + if (PRIMARYLANGID(gusLanguageID) != LANG_ENGLISH) + { + if (MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FONT_FAMILY, gusLanguageID) || + MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FULL_NAME, gusLanguageID)) + { + return TRUE; + } + } + return FALSE; +} + NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) @@ -4731,22 +4778,32 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) } else { - UNICODE_STRING FaceName; + UNICODE_STRING Name; PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); + PSHARED_FACE SharedFace = FontGdi->SharedFace; IntLockFreeType(); IntRequestFontSize(NULL, FontGdi, pLogFont->lfWidth, pLogFont->lfHeight); IntUnLockFreeType(); - RtlInitUnicodeString(&FaceName, NULL); - IntGetFontLocalizedName(&FaceName, FontGdi->SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); - - /* truncated copy */ - FaceName.Length = (USHORT)min(FaceName.Length, (LF_FACESIZE - 1) * sizeof(WCHAR)); - FaceName.MaximumLength = (USHORT)(FaceName.Length + sizeof(UNICODE_NULL)); - RtlCopyMemory(TextObj->FaceName, FaceName.Buffer, FaceName.MaximumLength); + TextObj->TextFace[0] = UNICODE_NULL; + if (MatchFontNames(SharedFace, SubstitutedLogFont.lfFaceName)) + { + RtlStringCchCopyW(TextObj->TextFace, _countof(TextObj->TextFace), pLogFont->lfFaceName); + } + else + { + RtlInitUnicodeString(&Name, NULL); + Status = IntGetFontLocalizedName(&Name, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); + if (NT_SUCCESS(Status)) + { + /* truncated copy */ + Name.Length = (USHORT)min(Name.Length, (LF_FACESIZE - 1) * sizeof(WCHAR)); + RtlStringCbCopyNW(TextObj->TextFace, Name.Length + sizeof(WCHAR), Name.Buffer, Name.Length); - RtlFreeUnicodeString(&FaceName); + RtlFreeUnicodeString(&Name); + } + } // Need hdev, when freetype is loaded need to create DEVOBJ for // Consumer and Producer. diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index ec0503fa46..2ea694103a 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -513,12 +513,12 @@ NtGdiGetTextFaceW( TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - fLen = wcslen(TextObj->FaceName) + 1; + fLen = wcslen(TextObj->TextFace) + 1; if (FaceName != NULL) { Count = min(Count, fLen); - Status = MmCopyToCaller(FaceName, TextObj->FaceName, Count * sizeof(WCHAR)); + Status = MmCopyToCaller(FaceName, TextObj->TextFace, Count * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { TEXTOBJ_UnlockText(TextObj); diff --git a/win32ss/gdi/ntgdi/text.h b/win32ss/gdi/ntgdi/text.h index cd8b5b22f0..830ceb1100 100644 --- a/win32ss/gdi/ntgdi/text.h +++ b/win32ss/gdi/ntgdi/text.h @@ -64,9 +64,7 @@ typedef struct _LFONT LFTYPE lft; FLONG fl; FONTOBJ *Font; - WCHAR FullName[LF_FULLFACESIZE]; - WCHAR Style[LF_FACESIZE]; - WCHAR FaceName[LF_FACESIZE]; + WCHAR TextFace[LF_FACESIZE]; DWORD dwOffsetEndArray; // Fixed: ENUMLOGFONTEXDVW logfont;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018