Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 74613: [WIN32K] -Reduce the ridiculous number of string allocations done by FindBestFontFromList and GetFontPenalty. CORE-13274
by gadamopoulos＠svn.reactos.org 21 May '17

21 May '17

Author: gadamopoulos Date: Sun May 21 16:47:07 2017 New Revision: 74613 URL: http://svn.reactos.org/svn/reactos?rev=74613&view=rev Log: [WIN32K] -Reduce the ridiculous number of string allocations done by FindBestFontFromList and GetFontPenalty. CORE-13274 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun May 21 16:47:07 2017 @@ -2323,46 +2323,22 @@ if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) Info->FontType |= RASTER_FONTTYPE; + + /* face name */ + if (!FaceName) + FaceName = (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFamilyName); + + RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), FaceName); + + /* full name */ + if (!FullName) + FullName = (WCHAR*)((ULONG_PTR) Otm + (ULONG_PTR)Otm->otmpFaceName); + + RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, + sizeof(Info->EnumLogFontEx.elfFullName), + FullName); + ExFreePoolWithTag(Otm, GDITAG_TEXT); - - /* face name */ - if (FaceName) - { - RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), FaceName); - } - else - { - status = IntGetFontLocalizedName(&NameW, SharedFace, TT_NAME_ID_FONT_FAMILY, - gusLanguageID); - if (NT_SUCCESS(status)) - { - /* store it */ - RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), - NameW.Buffer); - RtlFreeUnicodeString(&NameW); - } - } - - /* full name */ - if (FullName) - { - RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, - sizeof(Info->EnumLogFontEx.elfFullName), - FullName); - } - else - { - status = IntGetFontLocalizedName(&NameW, SharedFace, TT_NAME_ID_FULL_NAME, - gusLanguageID); - if (NT_SUCCESS(status)) - { - /* store it */ - RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, - sizeof(Info->EnumLogFontEx.elfFullName), - NameW.Buffer); - RtlFreeUnicodeString(&NameW); - } - } RtlInitAnsiString(&StyleA, Face->style_name); StyleW.Buffer = Info->EnumLogFontEx.elfStyle; @@ -4059,12 +4035,8 @@ static UINT FASTCALL GetFontPenalty(LOGFONTW * LogFont, PUNICODE_STRING RequestedNameW, - PUNICODE_STRING ActualNameW, - PUNICODE_STRING FullFaceNameW, BYTE RequestedCharSet, - PFONTGDI FontGDI, OUTLINETEXTMETRICW * Otm, - TEXTMETRICW * TM, const char * style_name) { ULONG Penalty = 0; @@ -4072,7 +4044,8 @@ LONG Long; BOOL fFixedSys = FALSE, fNeedScaling = FALSE; const BYTE UserCharSet = CharSetFromLangID(gusLanguageID); - NTSTATUS Status; + TEXTMETRICW * TM = &Otm->otmTextMetrics; + UNICODE_STRING ActualNameW; /* FIXME: Aspect Penalty 30 */ /* FIXME: IntSizeSynth Penalty 20 */ @@ -4206,53 +4179,22 @@ } } + RtlInitUnicodeString(&ActualNameW, (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFamilyName)); + if (RequestedNameW->Buffer[0]) { BOOL Found = FALSE; - PSHARED_FACE SharedFace = FontGDI->SharedFace; /* localized family name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, - gusLanguageID); - if (NT_SUCCESS(Status)) - { - Found = RtlEqualUnicodeString(RequestedNameW, ActualNameW, TRUE); - } + Found = RtlEqualUnicodeString(RequestedNameW, &ActualNameW, TRUE); } /* localized full name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FULL_NAME, - gusLanguageID); - if (NT_SUCCESS(Status)) - { - Found = RtlEqualUnicodeString(RequestedNameW, ActualNameW, TRUE); - } - } - if (gusLanguageID != gusEnglishUS) - { - /* English family name */ - if (!Found) - { - Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, - gusEnglishUS); - if (NT_SUCCESS(Status)) - { - Found = RtlEqualUnicodeString(RequestedNameW, ActualNameW, TRUE); - } - } - /* English full name */ - if (!Found) - { - Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FULL_NAME, - gusEnglishUS); - if (NT_SUCCESS(Status)) - { - Found = RtlEqualUnicodeString(RequestedNameW, ActualNameW, TRUE); - } - } + RtlInitUnicodeString(&ActualNameW, (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFaceName)); + Found = RtlEqualUnicodeString(RequestedNameW, &ActualNameW, TRUE); } if (!Found) { @@ -4451,7 +4393,7 @@ DPRINT("WARNING: Penalty:%ld < 200: RequestedNameW:%ls, " "ActualNameW:%ls, lfCharSet:%d, lfWeight:%ld, " "tmCharSet:%d, tmWeight:%ld\n", - Penalty, RequestedNameW->Buffer, ActualNameW->Buffer, + Penalty, RequestedNameW->Buffer, ActualNameW.Buffer, LogFont->lfCharSet, LogFont->lfWeight, TM->tmCharSet, TM->tmWeight); } @@ -4462,21 +4404,16 @@ static __inline VOID FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty, LOGFONTW *LogFont, PUNICODE_STRING pRequestedNameW, - PUNICODE_STRING pActualNameW, BYTE RequestedCharSet, + BYTE RequestedCharSet, PLIST_ENTRY Head) { ULONG Penalty; - NTSTATUS Status; PLIST_ENTRY Entry; PFONT_ENTRY CurrentEntry; FONTGDI *FontGDI; - ANSI_STRING ActualNameA; - UNICODE_STRING ActualNameW, FullFaceNameW; OUTLINETEXTMETRICW *Otm = NULL; UINT OtmSize, OldOtmSize = 0; - TEXTMETRICW *TM; FT_Face Face; - LPBYTE pb; ASSERT(FontObj); ASSERT(MatchPenalty); @@ -4484,6 +4421,10 @@ ASSERT(pRequestedNameW); ASSERT(Head); + /* Start with a pretty big buffer */ + OldOtmSize = 0x200; + Otm = ExAllocatePoolWithTag(PagedPool, OldOtmSize, GDITAG_TEXT); + /* get the FontObj of lowest penalty */ Entry = Head->Flink; while (Entry != Head) @@ -4495,14 +4436,6 @@ ASSERT(FontGDI); Face = FontGDI->SharedFace->Face; - /* create actual name */ - RtlInitAnsiString(&ActualNameA, Face->family_name); - Status = RtlAnsiStringToUnicodeString(&ActualNameW, &ActualNameA, TRUE); - if (!NT_SUCCESS(Status)) - { - continue; - } - /* get text metrics */ OtmSize = IntGetOutlineTextMetrics(FontGDI, 0, NULL); if (OtmSize > OldOtmSize) @@ -4516,37 +4449,16 @@ if (Otm) { IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm); - TM = &Otm->otmTextMetrics; OldOtmSize = OtmSize; - /* create full name */ - pb = (LPBYTE)Otm + (WORD)(DWORD_PTR)Otm->otmpFullName; - Status = RtlCreateUnicodeString(&FullFaceNameW, (LPWSTR)pb); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&ActualNameW); - RtlFreeUnicodeString(&FullFaceNameW); - continue; - } - - Penalty = GetFontPenalty(LogFont, pRequestedNameW, &ActualNameW, - &FullFaceNameW, RequestedCharSet, - FontGDI, Otm, TM, Face->style_name); + Penalty = GetFontPenalty(LogFont, pRequestedNameW, RequestedCharSet, + Otm, Face->style_name); if (*MatchPenalty == 0xFFFFFFFF || Penalty < *MatchPenalty) { - DPRINT("%ls Penalty: %lu\n", FullFaceNameW.Buffer, Penalty); - RtlFreeUnicodeString(pActualNameW); - RtlCreateUnicodeString(pActualNameW, ActualNameW.Buffer); - *FontObj = GDIToObj(FontGDI, FONT); *MatchPenalty = Penalty; } - - RtlFreeUnicodeString(&FullFaceNameW); - } - - /* free strings */ - RtlFreeUnicodeString(&ActualNameW); + } } if (Otm) @@ -4591,7 +4503,7 @@ { NTSTATUS Status = STATUS_SUCCESS; PTEXTOBJ TextObj; - UNICODE_STRING ActualNameW, RequestedNameW; + UNICODE_STRING RequestedNameW; PPROCESSINFO Win32Process; ULONG MatchPenalty; LOGFONTW *pLogFont; @@ -4616,8 +4528,6 @@ { TextObj = pTextObj; } - - RtlInitUnicodeString(&ActualNameW, NULL); pLogFont = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; if (!RtlCreateUnicodeString(&RequestedNameW, pLogFont->lfFaceName)) @@ -4641,14 +4551,14 @@ /* Search private fonts */ IntLockProcessPrivateFonts(Win32Process); FindBestFontFromList(&TextObj->Font, &MatchPenalty, pLogFont, - &RequestedNameW, &ActualNameW, RequestedCharSet, + &RequestedNameW, RequestedCharSet, &Win32Process->PrivateFontListHead); IntUnLockProcessPrivateFonts(Win32Process); /* Search system fonts */ IntLockGlobalFonts; FindBestFontFromList(&TextObj->Font, &MatchPenalty, pLogFont, - &RequestedNameW, &ActualNameW, RequestedCharSet, + &RequestedNameW, RequestedCharSet, &FontListHead); IntUnLockGlobalFonts; @@ -4683,14 +4593,9 @@ TextObj->fl |= TEXTOBJECT_INIT; Status = STATUS_SUCCESS; - - DPRINT("RequestedNameW: %ls (CharSet: %d) -> ActualNameW: %ls (CharSet: %d)\n", - RequestedNameW.Buffer, pLogFont->lfCharSet, - ActualNameW.Buffer, FontGdi->CharSet); } RtlFreeUnicodeString(&RequestedNameW); - RtlFreeUnicodeString(&ActualNameW); if (!pTextObj) TEXTOBJ_UnlockText(TextObj); ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0);

1 0

[mjansen] 74612: [WIN32SS] Improve IntGetFontLocalizedName by less strict matching on language id's. Patch by Katayama Hirofumi MZ. CORE-13239 #comment Thanks!
by mjansen＠svn.reactos.org 21 May '17

21 May '17

Author: mjansen Date: Sun May 21 12:24:57 2017 New Revision: 74612 URL: http://svn.reactos.org/svn/reactos?rev=74612&view=rev Log: [WIN32SS] Improve IntGetFontLocalizedName by less strict matching on language id's. Patch by Katayama Hirofumi MZ. CORE-13239 #comment Thanks! Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun May 21 12:24:57 2017 @@ -1783,7 +1783,7 @@ char *Cp; UNICODE_STRING FamilyNameW, FaceNameW, StyleNameW, FullNameW; PSHARED_FACE SharedFace = FontGDI->SharedFace; - PSHARED_FACE_CACHE Cache = (gusLanguageID == gusEnglishUS) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage; + PSHARED_FACE_CACHE Cache = (PRIMARYLANGID(gusLanguageID) == LANG_ENGLISH) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage; FT_Face Face = SharedFace->Face; if (Cache->OutlineRequiredSize && Size < Cache->OutlineRequiredSize) @@ -2096,42 +2096,58 @@ FT_UShort NameID, FT_UShort LangID) { FT_SfntName Name; - INT i, Count; + INT i, Count, BestIndex, Score, BestScore; WCHAR Buf[LF_FULLFACESIZE]; FT_Error Error; NTSTATUS Status = STATUS_NOT_FOUND; ANSI_STRING AnsiName; - PSHARED_FACE_CACHE Cache = (LangID == gusEnglishUS) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage; + PSHARED_FACE_CACHE Cache; FT_Face Face = SharedFace->Face; RtlFreeUnicodeString(pNameW); + /* select cache */ + if (PRIMARYLANGID(LangID) == LANG_ENGLISH) + { + Cache = &SharedFace->EnglishUS; + } + else + { + Cache = &SharedFace->UserLanguage; + } + + /* use cache if available */ if (NameID == TT_NAME_ID_FONT_FAMILY && Cache->FontFamily.Buffer) { return DuplicateUnicodeString(&Cache->FontFamily, pNameW); } - if (NameID == TT_NAME_ID_FULL_NAME && Cache->FullName.Buffer) { return DuplicateUnicodeString(&Cache->FullName, pNameW); } + + BestIndex = -1; + BestScore = 0; Count = FT_Get_Sfnt_Name_Count(Face); for (i = 0; i < Count; ++i) { Error = FT_Get_Sfnt_Name(Face, i, &Name); if (Error) - continue; + { + continue; /* failure */ + } + + if (Name.name_id != NameID) + { + continue; /* mismatched */ + } if (Name.platform_id != TT_PLATFORM_MICROSOFT || - Name.encoding_id != TT_MS_ID_UNICODE_CS) + (Name.encoding_id != TT_MS_ID_UNICODE_CS && + Name.encoding_id != TT_MS_ID_SYMBOL_CS)) { continue; /* not Microsoft Unicode name */ - } - - if (Name.name_id != NameID || Name.language_id != LangID) - { - continue; /* mismatched */ } if (Name.string == NULL || Name.string_len == 0 || @@ -2145,26 +2161,53 @@ continue; /* name too long */ } - /* NOTE: Name.string is not null-terminated */ - RtlCopyMemory(Buf, Name.string, Name.string_len); - Buf[Name.string_len / sizeof(WCHAR)] = UNICODE_NULL; - - /* Convert UTF-16 big endian to little endian */ - SwapEndian(Buf, Name.string_len); - - RtlCreateUnicodeString(pNameW, Buf); - Status = STATUS_SUCCESS; - break; - } - - if (Status == STATUS_NOT_FOUND) - { - if (LangID != gusEnglishUS) - { - /* Retry with English US */ - Status = IntGetFontLocalizedName(pNameW, SharedFace, NameID, gusEnglishUS); - } - else if (NameID == TT_NAME_ID_FONT_SUBFAMILY) + if (Name.language_id == LangID) + { + Score = 30; + BestIndex = i; + break; /* best match */ + } + else if (PRIMARYLANGID(Name.language_id) == PRIMARYLANGID(LangID)) + { + Score = 20; + } + else if (PRIMARYLANGID(Name.language_id) == LANG_ENGLISH) + { + Score = 10; + } + else + { + Score = 0; + } + + if (Score > BestScore) + { + BestScore = Score; + BestIndex = i; + } + } + + if (BestIndex >= 0) + { + /* store the best name */ + Error = (Score == 30) ? 0 : FT_Get_Sfnt_Name(Face, BestIndex, &Name); + if (!Error) + { + /* NOTE: Name.string is not null-terminated */ + RtlCopyMemory(Buf, Name.string, Name.string_len); + Buf[Name.string_len / sizeof(WCHAR)] = UNICODE_NULL; + + /* Convert UTF-16 big endian to little endian */ + SwapEndian(Buf, Name.string_len); + + Status = RtlCreateUnicodeString(pNameW, Buf); + } + } + + if (!NT_SUCCESS(Status)) + { + /* defaulted */ + if (NameID == TT_NAME_ID_FONT_SUBFAMILY) { RtlInitAnsiString(&AnsiName, Face->style_name); Status = RtlAnsiStringToUnicodeString(pNameW, &AnsiName, TRUE); @@ -2176,21 +2219,25 @@ } } - if (NameID == TT_NAME_ID_FONT_FAMILY) - { - ASSERT_FREETYPE_LOCK_NOT_HELD(); - IntLockFreeType; - if (!Cache->FontFamily.Buffer) - DuplicateUnicodeString(pNameW, &Cache->FontFamily); - IntUnLockFreeType; - } - else if (NameID == TT_NAME_ID_FULL_NAME) - { - ASSERT_FREETYPE_LOCK_NOT_HELD(); - IntLockFreeType; - if (!Cache->FullName.Buffer) - DuplicateUnicodeString(pNameW, &Cache->FullName); - IntUnLockFreeType; + if (NT_SUCCESS(Status)) + { + /* make cache */ + if (NameID == TT_NAME_ID_FONT_FAMILY) + { + ASSERT_FREETYPE_LOCK_NOT_HELD(); + IntLockFreeType; + if (!Cache->FontFamily.Buffer) + DuplicateUnicodeString(pNameW, &Cache->FontFamily); + IntUnLockFreeType; + } + else if (NameID == TT_NAME_ID_FULL_NAME) + { + ASSERT_FREETYPE_LOCK_NOT_HELD(); + IntLockFreeType; + if (!Cache->FullName.Buffer) + DuplicateUnicodeString(pNameW, &Cache->FullName); + IntUnLockFreeType; + } } return Status;

1 0

[mjansen] 74611: [KERNEL32] Format the stack trace generated on an unhandled exception so that log2lines can parse it. CORE-13232 #resolve
by mjansen＠svn.reactos.org 21 May '17

21 May '17

Author: mjansen Date: Sun May 21 11:31:56 2017 New Revision: 74611 URL: http://svn.reactos.org/svn/reactos?rev=74611&view=rev Log: [KERNEL32] Format the stack trace generated on an unhandled exception so that log2lines can parse it. CORE-13232 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sun May 21 11:31:56 2017 @@ -23,17 +23,30 @@ */ static const char* _module_name_from_addr(const void* addr, void **module_start_addr, - char* psz, size_t nChars) + char* psz, size_t nChars, char** module_name) { MEMORY_BASIC_INFORMATION mbi; if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) { psz[0] = '\0'; + *module_name = psz; *module_start_addr = 0; } else { + char* s1 = strrchr(psz, '\\'), *s2 = strrchr(psz, '/'); + if (s2 && !s1) + s1 = s2; + else if (s1 && s2 && s1 < s2) + s1 = s2; + + if (!s1) + s1 = psz; + else + s1++; + + *module_name = s1; *module_start_addr = (void *)mbi.AllocationBase; } return psz; @@ -78,7 +91,7 @@ PrintStackTrace(IN PEXCEPTION_POINTERS ExceptionInfo) { PVOID StartAddr; - CHAR szMod[128] = ""; + CHAR szMod[128] = "", *szModFile; PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; PCONTEXT ContextRecord = ExceptionInfo->ContextRecord; @@ -93,11 +106,12 @@ } _dump_context(ContextRecord); - _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); - DbgPrint("Address:\n %8x+%-8x %s\n", - (PVOID)StartAddr, + _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod), &szModFile); + DbgPrint("Address:\n<%s:%x> (%s@%x)\n", + szModFile, (ULONG_PTR)ExceptionRecord->ExceptionAddress - (ULONG_PTR)StartAddr, - szMod); + szMod, + StartAddr); #ifdef _M_IX86 DbgPrint("Frames:\n"); @@ -110,16 +124,17 @@ { if (IsBadReadPtr((PVOID)Frame[1], 4)) { - DbgPrint(" %8x%9s %s\n", Frame[1], "<invalid address>"," "); + DbgPrint("<%s:%x>\n", "[invalid address]", Frame[1]); } else { _module_name_from_addr((const void*)Frame[1], &StartAddr, - szMod, sizeof(szMod)); - DbgPrint(" %8x+%-8x %s\n", - (PVOID)StartAddr, + szMod, sizeof(szMod), &szModFile); + DbgPrint("<%s:%x> (%s@%x)\n", + szModFile, (ULONG_PTR)Frame[1] - (ULONG_PTR)StartAddr, - szMod); + szMod, + StartAddr); } if (IsBadReadPtr((PVOID)Frame[0], sizeof(*Frame) * 2))

1 0

[mjansen] 74610: [SHIMS] Add IgnoreDebugOutput shim CORE-10369
by mjansen＠svn.reactos.org 20 May '17

20 May '17

Author: mjansen Date: Sat May 20 20:22:25 2017 New Revision: 74610 URL: http://svn.reactos.org/svn/reactos?rev=74610&view=rev Log: [SHIMS] Add IgnoreDebugOutput shim CORE-10369 Added: trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c (with props) Modified: trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt Modified: trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt [iso-8859-1] Sat May 20 20:22:25 2017 @@ -4,6 +4,7 @@ spec2def(acgenral.dll genral.spec) list(APPEND SOURCE + ignoredbgout.c main.c themes.c genral.spec) Added: trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c (added) +++ trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c [iso-8859-1] Sat May 20 20:22:25 2017 @@ -0,0 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/genral/ignoredbgout.c + * PURPOSE: Ignore debug output shim + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <shimlib.h> +#include <strsafe.h> + + +#define SHIM_NS IgnoreDebugOutput +#include <setup_shim.inl> + +void WINAPI SHIM_OBJ_NAME(OutputDebugStringA)(LPCSTR lpOutputString) +{ + (VOID)lpOutputString; +} + +void WINAPI SHIM_OBJ_NAME(OutputDebugStringW)(LPCWSTR lpOutputString) +{ + (VOID)lpOutputString; +} + +#define SHIM_NUM_HOOKS 2 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "OutputDebugStringA", SHIM_OBJ_NAME(OutputDebugStringA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "OutputDebugStringW", SHIM_OBJ_NAME(OutputDebugStringW)) + +#include <implement_shim.inl> Propchange: trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjansen] 74609: [BOOTDATA] Create an empty HKLM\...\AppCompatFlags\Layers key to silence logging.
by mjansen＠svn.reactos.org 20 May '17

20 May '17

Author: mjansen Date: Sat May 20 20:06:46 2017 New Revision: 74609 URL: http://svn.reactos.org/svn/reactos?rev=74609&view=rev Log: [BOOTDATA] Create an empty HKLM\...\AppCompatFlags\Layers key to silence logging. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat May 20 20:06:46 2017 @@ -379,6 +379,9 @@ ; Uninstall Application list HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012 + +; Empty App Compat Layers +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers","",0x00000000,"" ; Version Information HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","InstallDate",0x00010003,0 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat May 20 20:06:46 2017 @@ -1391,9 +1391,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" -# This is an empty app compat cache -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatCache","AppCompatCache", 0x00000001, \ - fe,0f,dc,ba,00,00,00,00 ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" @@ -1450,6 +1447,10 @@ ; App Compat -- Disable on ReactOS HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatibility","DisableAppCompat",0x00010003, 0x00000001 + +; This is an empty App Compat cache +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatCache","AppCompatCache", 0x00000001, \ + fe,0f,dc,ba,00,00,00,00 ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,""

1 0

[mjansen] 74608: [SLAYER] Remove the shell extension. CORE-13111 #resolve
by mjansen＠svn.reactos.org 20 May '17

20 May '17

Author: mjansen Date: Sat May 20 19:58:04 2017 New Revision: 74608 URL: http://svn.reactos.org/svn/reactos?rev=74608&view=rev Log: [SLAYER] Remove the shell extension. CORE-13111 #resolve Removed: trunk/reactos/dll/shellext/slayer/ Modified: trunk/reactos/dll/shellext/CMakeLists.txt Modified: trunk/reactos/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] Sat May 20 19:58:04 2017 @@ -7,5 +7,4 @@ add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(shellbtrfs) -add_subdirectory(slayer) add_subdirectory(stobject)

1 0

[mjansen] 74607: [WIN32SS] Reduce the amount of calls to IntGetFontLocalizedName, since this was identified as a source of recent slower drawing. CORE-13274 Thanks to Thomas, Giannis and Joachim.
by mjansen＠svn.reactos.org 20 May '17

20 May '17

Author: mjansen Date: Sat May 20 18:59:00 2017 New Revision: 74607 URL: http://svn.reactos.org/svn/reactos?rev=74607&view=rev Log: [WIN32SS] Reduce the amount of calls to IntGetFontLocalizedName, since this was identified as a source of recent slower drawing. CORE-13274 Thanks to Thomas, Giannis and Joachim. Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] Sat May 20 18:59:00 2017 @@ -114,10 +114,18 @@ LONG RefCount; } SHARED_MEM, *PSHARED_MEM; +typedef struct _SHARED_FACE_CACHE { + UINT OutlineRequiredSize; + UNICODE_STRING FontFamily; + UNICODE_STRING FullName; +} SHARED_FACE_CACHE, *PSHARED_FACE_CACHE; + typedef struct _SHARED_FACE { FT_Face Face; LONG RefCount; PSHARED_MEM Memory; + SHARED_FACE_CACHE EnglishUS; + SHARED_FACE_CACHE UserLanguage; } SHARED_FACE, *PSHARED_FACE; typedef struct _FONTGDI { Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat May 20 18:59:00 2017 @@ -85,6 +85,9 @@ #define ASSERT_FREETYPE_LOCK_HELD() \ ASSERT(FreeTypeLock->Owner == KeGetCurrentThread()) + +#define ASSERT_FREETYPE_LOCK_NOT_HELD() \ + ASSERT(FreeTypeLock->Owner != KeGetCurrentThread()) #define MAX_FONT_CACHE 256 @@ -171,6 +174,14 @@ ++Ptr->RefCount; } +static void +SharedFaceCache_Init(PSHARED_FACE_CACHE Cache) +{ + Cache->OutlineRequiredSize = 0; + RtlInitUnicodeString(&Cache->FontFamily, NULL); + RtlInitUnicodeString(&Cache->FullName, NULL); +} + static PSHARED_FACE SharedFace_Create(FT_Face Face, PSHARED_MEM Memory) { @@ -181,6 +192,9 @@ Ptr->Face = Face; Ptr->RefCount = 1; Ptr->Memory = Memory; + SharedFaceCache_Init(&Ptr->EnglishUS); + SharedFaceCache_Init(&Ptr->UserLanguage); + SharedMem_AddRef(Memory); DPRINT("Creating SharedFace for %s\n", Face->family_name); } @@ -265,6 +279,13 @@ } static void +SharedFaceCache_Release(PSHARED_FACE_CACHE Cache) +{ + RtlFreeUnicodeString(&Cache->FontFamily); + RtlFreeUnicodeString(&Cache->FullName); +} + +static void SharedFace_Release(PSHARED_FACE Ptr) { IntLockFreeType; @@ -280,6 +301,8 @@ RemoveCacheEntries(Ptr->Face); FT_Done_Face(Ptr->Face); SharedMem_Release(Ptr->Memory); + SharedFaceCache_Release(&Ptr->EnglishUS); + SharedFaceCache_Release(&Ptr->UserLanguage); ExFreePoolWithTag(Ptr, TAG_FONT); } IntUnLockFreeType; @@ -1739,7 +1762,7 @@ } static NTSTATUS -IntGetFontLocalizedName(PUNICODE_STRING pNameW, FT_Face Face, +IntGetFontLocalizedName(PUNICODE_STRING pNameW, PSHARED_FACE SharedFace, FT_UShort NameID, FT_UShort LangID); /************************************************************* @@ -1751,7 +1774,6 @@ UINT Size, OUTLINETEXTMETRICW *Otm) { - unsigned Needed; TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; @@ -1759,38 +1781,51 @@ FT_WinFNT_HeaderRec Win; FT_Error Error; char *Cp; - FT_Face Face = FontGDI->SharedFace->Face; UNICODE_STRING FamilyNameW, FaceNameW, StyleNameW, FullNameW; + PSHARED_FACE SharedFace = FontGDI->SharedFace; + PSHARED_FACE_CACHE Cache = (gusLanguageID == gusEnglishUS) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage; + FT_Face Face = SharedFace->Face; + + if (Cache->OutlineRequiredSize && Size < Cache->OutlineRequiredSize) + { + return Cache->OutlineRequiredSize; + } /* family name */ RtlInitUnicodeString(&FamilyNameW, NULL); - IntGetFontLocalizedName(&FamilyNameW, Face, TT_NAME_ID_FONT_FAMILY, gusLanguageID); + IntGetFontLocalizedName(&FamilyNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); /* face name */ RtlInitUnicodeString(&FaceNameW, NULL); - IntGetFontLocalizedName(&FaceNameW, Face, TT_NAME_ID_FULL_NAME, gusLanguageID); + IntGetFontLocalizedName(&FaceNameW, SharedFace, TT_NAME_ID_FULL_NAME, gusLanguageID); /* style name */ RtlInitUnicodeString(&StyleNameW, NULL); - IntGetFontLocalizedName(&StyleNameW, Face, TT_NAME_ID_FONT_SUBFAMILY, gusLanguageID); + IntGetFontLocalizedName(&StyleNameW, SharedFace, TT_NAME_ID_FONT_SUBFAMILY, gusLanguageID); /* unique name (full name) */ RtlInitUnicodeString(&FullNameW, NULL); - IntGetFontLocalizedName(&FullNameW, Face, TT_NAME_ID_UNIQUE_ID, gusLanguageID); - - Needed = sizeof(OUTLINETEXTMETRICW); - Needed += FamilyNameW.Length + sizeof(WCHAR); - Needed += FaceNameW.Length + sizeof(WCHAR); - Needed += StyleNameW.Length + sizeof(WCHAR); - Needed += FullNameW.Length + sizeof(WCHAR); - - if (Size < Needed) + IntGetFontLocalizedName(&FullNameW, SharedFace, TT_NAME_ID_UNIQUE_ID, gusLanguageID); + + if (!Cache->OutlineRequiredSize) + { + UINT Needed; + Needed = sizeof(OUTLINETEXTMETRICW); + Needed += FamilyNameW.Length + sizeof(WCHAR); + Needed += FaceNameW.Length + sizeof(WCHAR); + Needed += StyleNameW.Length + sizeof(WCHAR); + Needed += FullNameW.Length + sizeof(WCHAR); + + Cache->OutlineRequiredSize = Needed; + } + + if (Size < Cache->OutlineRequiredSize) { RtlFreeUnicodeString(&FamilyNameW); RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); RtlFreeUnicodeString(&FullNameW); - return Needed; + return Cache->OutlineRequiredSize; } XScale = Face->size->metrics.x_scale; @@ -1825,7 +1860,7 @@ Error = FT_Get_WinFNT_Header(Face , &Win); - Otm->otmSize = Needed; + Otm->otmSize = Cache->OutlineRequiredSize; FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0); @@ -1895,14 +1930,14 @@ wcscpy((WCHAR*) Cp, FullNameW.Buffer); Cp += FullNameW.Length + sizeof(WCHAR); - ASSERT(Cp - (char*)Otm == Needed); + ASSERT(Cp - (char*)Otm == Cache->OutlineRequiredSize); RtlFreeUnicodeString(&FamilyNameW); RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); RtlFreeUnicodeString(&FullNameW); - return Needed; + return Cache->OutlineRequiredSize; } static PFONTGDI FASTCALL @@ -2034,7 +2069,30 @@ } static NTSTATUS -IntGetFontLocalizedName(PUNICODE_STRING pNameW, FT_Face Face, +DuplicateUnicodeString(PUNICODE_STRING Source, PUNICODE_STRING Destination) +{ + NTSTATUS Status = STATUS_NO_MEMORY; + UNICODE_STRING Tmp; + + Tmp.Buffer = ExAllocatePoolWithTag(PagedPool, Source->MaximumLength, TAG_USTR); + if (Tmp.Buffer) + { + Tmp.MaximumLength = Source->MaximumLength; + Tmp.Length = 0; + RtlCopyUnicodeString(&Tmp, Source); + + Destination->MaximumLength = Tmp.MaximumLength; + Destination->Length = Tmp.Length; + Destination->Buffer = Tmp.Buffer; + + Status = STATUS_SUCCESS; + } + + return Status; +} + +static NTSTATUS +IntGetFontLocalizedName(PUNICODE_STRING pNameW, PSHARED_FACE SharedFace, FT_UShort NameID, FT_UShort LangID) { FT_SfntName Name; @@ -2043,8 +2101,20 @@ FT_Error Error; NTSTATUS Status = STATUS_NOT_FOUND; ANSI_STRING AnsiName; + PSHARED_FACE_CACHE Cache = (LangID == gusEnglishUS) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage; + FT_Face Face = SharedFace->Face; RtlFreeUnicodeString(pNameW); + + if (NameID == TT_NAME_ID_FONT_FAMILY && Cache->FontFamily.Buffer) + { + return DuplicateUnicodeString(&Cache->FontFamily, pNameW); + } + + if (NameID == TT_NAME_ID_FULL_NAME && Cache->FullName.Buffer) + { + return DuplicateUnicodeString(&Cache->FullName, pNameW); + } Count = FT_Get_Sfnt_Name_Count(Face); for (i = 0; i < Count; ++i) @@ -2092,7 +2162,7 @@ if (LangID != gusEnglishUS) { /* Retry with English US */ - Status = IntGetFontLocalizedName(pNameW, Face, NameID, gusEnglishUS); + Status = IntGetFontLocalizedName(pNameW, SharedFace, NameID, gusEnglishUS); } else if (NameID == TT_NAME_ID_FONT_SUBFAMILY) { @@ -2104,6 +2174,23 @@ RtlInitAnsiString(&AnsiName, Face->family_name); Status = RtlAnsiStringToUnicodeString(pNameW, &AnsiName, TRUE); } + } + + if (NameID == TT_NAME_ID_FONT_FAMILY) + { + ASSERT_FREETYPE_LOCK_NOT_HELD(); + IntLockFreeType; + if (!Cache->FontFamily.Buffer) + DuplicateUnicodeString(pNameW, &Cache->FontFamily); + IntUnLockFreeType; + } + else if (NameID == TT_NAME_ID_FULL_NAME) + { + ASSERT_FREETYPE_LOCK_NOT_HELD(); + IntLockFreeType; + if (!Cache->FullName.Buffer) + DuplicateUnicodeString(pNameW, &Cache->FullName); + IntUnLockFreeType; } return Status; @@ -2125,7 +2212,8 @@ NEWTEXTMETRICW *Ntm; DWORD fs0; NTSTATUS status; - FT_Face Face = FontGDI->SharedFace->Face; + PSHARED_FACE SharedFace = FontGDI->SharedFace; + FT_Face Face = SharedFace->Face; UNICODE_STRING NameW; RtlInitUnicodeString(&NameW, NULL); @@ -2197,7 +2285,7 @@ } else { - status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY, + status = IntGetFontLocalizedName(&NameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); if (NT_SUCCESS(status)) { @@ -2217,7 +2305,7 @@ } else { - status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FULL_NAME, + status = IntGetFontLocalizedName(&NameW, SharedFace, TT_NAME_ID_FULL_NAME, gusLanguageID); if (NT_SUCCESS(status)) { @@ -4074,12 +4162,12 @@ if (RequestedNameW->Buffer[0]) { BOOL Found = FALSE; - FT_Face Face = FontGDI->SharedFace->Face; + PSHARED_FACE SharedFace = FontGDI->SharedFace; /* localized family name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, Face, TT_NAME_ID_FONT_FAMILY, + Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); if (NT_SUCCESS(Status)) { @@ -4089,7 +4177,7 @@ /* localized full name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, Face, TT_NAME_ID_FULL_NAME, + Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FULL_NAME, gusLanguageID); if (NT_SUCCESS(Status)) { @@ -4101,7 +4189,7 @@ /* English family name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, Face, TT_NAME_ID_FONT_FAMILY, + Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusEnglishUS); if (NT_SUCCESS(Status)) { @@ -4111,7 +4199,7 @@ /* English full name */ if (!Found) { - Status = IntGetFontLocalizedName(ActualNameW, Face, TT_NAME_ID_FULL_NAME, + Status = IntGetFontLocalizedName(ActualNameW, SharedFace, TT_NAME_ID_FULL_NAME, gusEnglishUS); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat May 20 18:59:00 2017 @@ -997,6 +997,8 @@ NT_ROF(InitTimerImpl()); NT_ROF(InitDCEImpl()); + gusLanguageID = UserGetLanguageID(); + /* Initialize FreeType library */ if (!InitFontSupport()) { @@ -1004,8 +1006,6 @@ return Status; } - gusLanguageID = UserGetLanguageID(); - return STATUS_SUCCESS; }

1 0

[ekohl] 74606: [INF] Make code page and language group names translatable. CORE-11885
by ekohl＠svn.reactos.org 20 May '17

20 May '17

Author: ekohl Date: Sat May 20 13:46:48 2017 New Revision: 74606 URL: http://svn.reactos.org/svn/reactos?rev=74606&view=rev Log: [INF] Make code page and language group names translatable. CORE-11885 Modified: trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=746… ============================================================================== Binary files - no diff available.

1 0

[tfaber] 74605: [WIN32K:NTGDI] - Simplify list walk in FindBestFontFromList
by tfaber＠svn.reactos.org 20 May '17

20 May '17

Author: tfaber Date: Sat May 20 12:11:08 2017 New Revision: 74605 URL: http://svn.reactos.org/svn/reactos?rev=74605&view=rev Log: [WIN32K:NTGDI] - Simplify list walk in FindBestFontFromList Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat May 20 12:11:08 2017 @@ -4354,6 +4354,8 @@ while (Entry != Head) { CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); + Entry = Entry->Flink; + FontGDI = CurrentEntry->Font; ASSERT(FontGDI); Face = FontGDI->SharedFace->Face; @@ -4363,8 +4365,6 @@ Status = RtlAnsiStringToUnicodeString(&ActualNameW, &ActualNameA, TRUE); if (!NT_SUCCESS(Status)) { - /* next entry */ - Entry = Entry->Flink; continue; } @@ -4391,8 +4391,6 @@ { RtlFreeUnicodeString(&ActualNameW); RtlFreeUnicodeString(&FullFaceNameW); - /* next entry */ - Entry = Entry->Flink; continue; } @@ -4414,9 +4412,6 @@ /* free strings */ RtlFreeUnicodeString(&ActualNameW); - - /* next entry */ - Entry = Entry->Flink; } if (Otm)

1 0

[ekohl] 74604: [INF] Make language (locale) names translatable. CORE-11885
by ekohl＠svn.reactos.org 20 May '17

20 May '17

Author: ekohl Date: Sat May 20 09:53:15 2017 New Revision: 74604 URL: http://svn.reactos.org/svn/reactos?rev=74604&view=rev Log: [INF] Make language (locale) names translatable. CORE-11885 Modified: trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=746… ============================================================================== Binary files - no diff available.

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