Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32SS][NTUSER] Fix popup menu freezing
by Katayama Hirofumi MZ 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03adec81414abb53e589e… commit 03adec81414abb53e589ecd9061042b9ca2104c1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 10 15:40:32 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Aug 10 15:40:32 2019 +0900 [WIN32SS][NTUSER] Fix popup menu freezing --- win32ss/user/ntuser/menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index eef10076d1c..b2e7efe2d2b 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2803,7 +2803,8 @@ static BOOL MENU_InitPopup( PWND pWndOwner, PMENU menu, UINT flags ) if (flags & TPM_LAYOUTRTL || pWndOwner->ExStyle & WS_EX_LAYOUTRTL) ex_style |= WS_EX_LAYOUTRTL; - RtlInitUnicodeString(&ClassName, WC_MENU); + ClassName.Buffer = WC_MENU; + ClassName.Length = 0; RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs));

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Registry-based font management (#1816)
by Katayama Hirofumi MZ 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b526bceac3b6bad263b3… commit 2b526bceac3b6bad263b308be779b7525d3cd8aa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 10 14:52:09 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 14:52:09 2019 +0900 [WIN32SS][NTGDI] Registry-based font management (#1816) CORE-16269 - Add IntGdiAddFontResourceEx function that is extended from IntGdiAddFontResource, in order to add dwFlags parameter. - Add IntLoadFontsInRegistry function that will load the fonts from registry info. - If loading from registry failed, IntLoadSystemFonts will be called. - Use IntLoadFontsInRegistry rather than IntLoadSystemFonts in the OS startup. - Add NameFromCharSet function. - Append " (CharSetName)" to registry value name if not TrueType. --- win32ss/gdi/ntgdi/font.h | 1 + win32ss/gdi/ntgdi/freetype.c | 267 +++++++++++++++++++++++++++++++++++++++++-- win32ss/gdi/ntgdi/text.h | 6 + 3 files changed, 264 insertions(+), 10 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index b5629c794fe..908a9f5b65f 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -62,6 +62,7 @@ typedef struct GDI_LOAD_FONT DWORD Characteristics; UNICODE_STRING RegValueName; BOOL IsTrueType; + BYTE CharSet; PFONT_ENTRY_MEM PrivateEntry; } GDI_LOAD_FONT, *PGDI_LOAD_FONT; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 2578bc04e27..b5ae335eabb 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -686,7 +686,14 @@ InitFontSupport(VOID) return FALSE; } - IntLoadSystemFonts(); + if (!IntLoadFontsInRegistry()) + { + DPRINT1("Fonts registry is empty.\n"); + + /* Load font(s) with writing registry */ + IntLoadSystemFonts(); + } + IntLoadFontSubstList(&g_FontSubstListHead); #if DBG @@ -1020,7 +1027,7 @@ IntLoadSystemFonts(VOID) TempString.MaximumLength = DirInfo->FileNameLength; RtlCopyUnicodeString(&FileName, &Directory); RtlAppendUnicodeStringToString(&FileName, &TempString); - IntGdiAddFontResource(&FileName, 0); + IntGdiAddFontResourceEx(&FileName, 0, AFRX_WRITE_REGISTRY); if (DirInfo->NextEntryOffset == 0) break; DirInfo = (PFILE_DIRECTORY_INFORMATION)((ULONG_PTR)DirInfo + DirInfo->NextEntryOffset); @@ -1316,6 +1323,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) if (!Error) { FontGDI->CharSet = WinFNT.charset; + pLoadFont->CharSet = WinFNT.charset; } IntUnLockFreeType(); } @@ -1526,6 +1534,34 @@ Finish: } } +static LPCWSTR FASTCALL +NameFromCharSet(BYTE CharSet) +{ + switch (CharSet) + { + case ANSI_CHARSET: return L"ANSI"; + case DEFAULT_CHARSET: return L"Default"; + case SYMBOL_CHARSET: return L"Symbol"; + case SHIFTJIS_CHARSET: return L"Shift_JIS"; + case HANGUL_CHARSET: return L"Hangul"; + case GB2312_CHARSET: return L"GB 2312"; + case CHINESEBIG5_CHARSET: return L"Chinese Big5"; + case OEM_CHARSET: return L"OEM"; + case JOHAB_CHARSET: return L"Johab"; + case HEBREW_CHARSET: return L"Hebrew"; + case ARABIC_CHARSET: return L"Arabic"; + case GREEK_CHARSET: return L"Greek"; + case TURKISH_CHARSET: return L"Turkish"; + case VIETNAMESE_CHARSET: return L"Vietnamese"; + case THAI_CHARSET: return L"Thai"; + case EASTEUROPE_CHARSET: return L"Eastern European"; + case RUSSIAN_CHARSET: return L"Russian"; + case MAC_CHARSET: return L"Mac"; + case BALTIC_CHARSET: return L"Baltic"; + default: return L"Unknown"; + } +} + /* * IntGdiAddFontResource * @@ -1533,7 +1569,8 @@ Finish: */ INT FASTCALL -IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) +IntGdiAddFontResourceEx(PUNICODE_STRING FileName, DWORD Characteristics, + DWORD dwFlags) { NTSTATUS Status; HANDLE FileHandle; @@ -1588,6 +1625,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) LoadFont.Characteristics = Characteristics; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); LoadFont.IsTrueType = FALSE; + LoadFont.CharSet = DEFAULT_CHARSET; LoadFont.PrivateEntry = NULL; FontCount = IntGdiLoadFontsFromMemory(&LoadFont); @@ -1599,15 +1637,15 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) ObDereferenceObject(SectionObject); /* Save the loaded font name into the registry */ - if (FontCount > 0) + if (FontCount > 0 && (dwFlags & AFRX_WRITE_REGISTRY)) { + UNICODE_STRING NewString; + SIZE_T Length; + PWCHAR pszBuffer; + LPCWSTR CharSetName; if (LoadFont.IsTrueType) { /* Append " (TrueType)" */ - UNICODE_STRING NewString; - SIZE_T Length; - PWCHAR pszBuffer; - Length = LoadFont.RegValueName.Length + TrueTypePostfix.Length + sizeof(UNICODE_NULL); pszBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_USTR); if (pszBuffer) @@ -1624,6 +1662,31 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) // FIXME! } } + else if (LoadFont.CharSet != DEFAULT_CHARSET) + { + /* Append " (CharSetName)" */ + CharSetName = NameFromCharSet(LoadFont.CharSet); + Length = LoadFont.RegValueName.Length + + (wcslen(CharSetName) + 3) * sizeof(WCHAR) + + sizeof(UNICODE_NULL); + + pszBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_USTR); + if (pszBuffer) + { + RtlInitEmptyUnicodeString(&NewString, pszBuffer, (USHORT)Length); + NewString.Buffer[0] = UNICODE_NULL; + RtlAppendUnicodeStringToString(&NewString, &LoadFont.RegValueName); + RtlAppendUnicodeToString(&NewString, L" ("); + RtlAppendUnicodeToString(&NewString, CharSetName); + RtlAppendUnicodeToString(&NewString, L")"); + RtlFreeUnicodeString(&LoadFont.RegValueName); + LoadFont.RegValueName = NewString; + } + else + { + // FIXME! + } + } InitializeObjectAttributes(&ObjectAttributes, &g_FontRegPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, @@ -1632,10 +1695,23 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) if (NT_SUCCESS(Status)) { SIZE_T DataSize; - LPWSTR pFileName = wcsrchr(FileName->Buffer, L'\\'); + LPWSTR pFileName; + + if (dwFlags & AFRX_ALTERNATIVE_PATH) + { + pFileName = FileName->Buffer; + } + else + { + pFileName = wcsrchr(FileName->Buffer, L'\\'); + } + if (pFileName) { - pFileName++; + if (!(dwFlags & AFRX_ALTERNATIVE_PATH)) + { + pFileName++; + } DataSize = (wcslen(pFileName) + 1) * sizeof(WCHAR); ZwSetValueKey(KeyHandle, &LoadFont.RegValueName, 0, REG_SZ, pFileName, DataSize); @@ -1648,6 +1724,177 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) return FontCount; } +INT FASTCALL +IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) +{ + return IntGdiAddFontResourceEx(FileName, Characteristics, 0); +} + +/* Borrowed from shlwapi!PathIsRelativeW */ +BOOL WINAPI PathIsRelativeW(LPCWSTR lpszPath) +{ + if (!lpszPath || !*lpszPath) + return TRUE; + if (*lpszPath == L'\\' || (*lpszPath && lpszPath[1] == L':')) + return FALSE; + return TRUE; +} + +BOOL FASTCALL +IntLoadFontsInRegistry(VOID) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + KEY_FULL_INFORMATION KeyFullInfo; + ULONG i, Length; + UNICODE_STRING FontTitleW, FileNameW; + SIZE_T InfoSize; + LPBYTE InfoBuffer; + PKEY_VALUE_FULL_INFORMATION pInfo; + LPWSTR pchPath; + BOOLEAN Success; + WCHAR szPath[MAX_PATH]; + INT nFontCount = 0; + DWORD dwFlags; + + /* open registry key */ + InitializeObjectAttributes(&ObjectAttributes, &g_FontRegPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey failed: 0x%08X\n", Status); + return FALSE; /* failure */ + } + + /* query count of values */ + Status = ZwQueryKey(KeyHandle, KeyFullInformation, + &KeyFullInfo, sizeof(KeyFullInfo), &Length); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryKey failed: 0x%08X\n", Status); + ZwClose(KeyHandle); + return FALSE; /* failure */ + } + + /* allocate buffer */ + InfoSize = (MAX_PATH + 256) * sizeof(WCHAR); + InfoBuffer = ExAllocatePoolWithTag(PagedPool, InfoSize, TAG_FONT); + if (!InfoBuffer) + { + DPRINT1("ExAllocatePoolWithTag failed\n"); + ZwClose(KeyHandle); + return FALSE; + } + + /* for each value */ + for (i = 0; i < KeyFullInfo.Values; ++i) + { + /* get value name */ + Status = ZwEnumerateValueKey(KeyHandle, i, KeyValueFullInformation, + InfoBuffer, InfoSize, &Length); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + /* too short buffer */ + ExFreePoolWithTag(InfoBuffer, TAG_FONT); + InfoSize *= 2; + InfoBuffer = ExAllocatePoolWithTag(PagedPool, InfoSize, TAG_FONT); + if (!InfoBuffer) + { + DPRINT1("ExAllocatePoolWithTag failed\n"); + break; + } + /* try again */ + Status = ZwEnumerateValueKey(KeyHandle, i, KeyValueFullInformation, + InfoBuffer, InfoSize, &Length); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateValueKey failed: 0x%08X\n", Status); + break; /* failure */ + } + + /* create FontTitleW string */ + pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; + Length = pInfo->NameLength / sizeof(WCHAR); + pInfo->Name[Length] = UNICODE_NULL; /* truncate */ + Success = RtlCreateUnicodeString(&FontTitleW, pInfo->Name); + if (!Success) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + DPRINT("RtlCreateUnicodeString failed\n"); + break; /* failure */ + } + + /* query value */ + Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation, + InfoBuffer, InfoSize, &Length); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + /* too short buffer */ + ExFreePoolWithTag(InfoBuffer, TAG_FONT); + InfoSize *= 2; + InfoBuffer = ExAllocatePoolWithTag(PagedPool, InfoSize, TAG_FONT); + if (!InfoBuffer) + { + DPRINT1("ExAllocatePoolWithTag failed\n"); + break; + } + /* try again */ + Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation, + InfoBuffer, InfoSize, &Length); + } + pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; + if (!NT_SUCCESS(Status) || !pInfo->DataLength) + { + DPRINT("ZwQueryValueKey failed: 0x%08X\n", Status); + RtlFreeUnicodeString(&FontTitleW); + break; /* failure */ + } + + /* Build pchPath */ + pchPath = (LPWSTR)((PUCHAR)pInfo + pInfo->DataOffset); + Length = pInfo->DataLength / sizeof(WCHAR); + pchPath[Length] = UNICODE_NULL; /* truncate */ + + /* Load font(s) without writing registry */ + dwFlags = 0; + if (PathIsRelativeW(pchPath)) + { + Status = RtlStringCbPrintfW(szPath, sizeof(szPath), + L"%s\\Fonts\\%s", + SharedUserData->NtSystemRoot, pchPath); + } + else + { + dwFlags |= AFRX_ALTERNATIVE_PATH; + Status = RtlStringCbCopyW(szPath, sizeof(szPath), pchPath); + } + + if (NT_SUCCESS(Status)) + { + RtlCreateUnicodeString(&FileNameW, szPath); + nFontCount += IntGdiAddFontResourceEx(&FileNameW, 0, dwFlags); + RtlFreeUnicodeString(&FileNameW); + } + + RtlFreeUnicodeString(&FontTitleW); + } + + /* close now */ + ZwClose(KeyHandle); + + /* free memory block */ + if (InfoBuffer) + { + ExFreePoolWithTag(InfoBuffer, TAG_FONT); + } + + return (KeyFullInfo.Values != 0 && nFontCount != 0); +} + HANDLE FASTCALL IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) { diff --git a/win32ss/gdi/ntgdi/text.h b/win32ss/gdi/ntgdi/text.h index 830ceb11009..10a74c60032 100644 --- a/win32ss/gdi/ntgdi/text.h +++ b/win32ss/gdi/ntgdi/text.h @@ -100,6 +100,9 @@ TEXTOBJ_UnlockText(PLFONT plfnt) LFONT_ShareUnlockFont(plfnt); } +/* dwFlags for IntGdiAddFontResourceEx */ +#define AFRX_WRITE_REGISTRY 0x1 +#define AFRX_ALTERNATIVE_PATH 0x2 PTEXTOBJ FASTCALL RealizeFontInit(HFONT); NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ); @@ -111,8 +114,11 @@ BOOL FASTCALL IntIsFontRenderingEnabled(VOID); VOID FASTCALL IntEnableFontRendering(BOOL Enable); ULONG FASTCALL FontGetObject(PTEXTOBJ TextObj, ULONG Count, PVOID Buffer); VOID FASTCALL IntLoadSystemFonts(VOID); +BOOL FASTCALL IntLoadFontsInRegistry(VOID); VOID FASTCALL IntGdiCleanupPrivateFontsForProcess(VOID); INT FASTCALL IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics); +INT FASTCALL IntGdiAddFontResourceEx(PUNICODE_STRING FileName, DWORD Characteristics, + DWORD dwFlags); HANDLE FASTCALL IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded); BOOL FASTCALL IntGdiRemoveFontMemResource(HANDLE hMMFont); ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL);

1 0

[reactos] 01/01: [WIN32SS][NTUSER] Fix popup menu window styles (#1814)
by Katayama Hirofumi MZ 09 Aug '19

09 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0749a868fcae2f7c0963b… commit 0749a868fcae2f7c0963b7cc010aa622d2515c6c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 10 08:33:25 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 08:33:25 2019 +0900 [WIN32SS][NTUSER] Fix popup menu window styles (#1814) Fix the class style, the window style and the extended style of the popup menu window. CORE-16244 --- win32ss/user/ntuser/class.c | 2 +- win32ss/user/ntuser/menu.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/class.c b/win32ss/user/ntuser/class.c index 5982d6b9e38..2bda75012d6 100644 --- a/win32ss/user/ntuser/class.c +++ b/win32ss/user/ntuser/class.c @@ -53,7 +53,7 @@ REGISTER_SYSCLASS DefaultServerClasses[] = ICLS_SWITCH }, { ((PWSTR)((ULONG_PTR)(WORD)(0x8000))), - CS_DBLCLKS|CS_SAVEBITS, + CS_DBLCLKS|CS_SAVEBITS|CS_DROPSHADOW, NULL, // Use User32 procs sizeof(LONG), (HICON)OCR_NORMAL, diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index a826ddbc58c..eef10076d1c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2794,21 +2794,20 @@ static BOOL MENU_InitPopup( PWND pWndOwner, PMENU menu, UINT flags ) CREATESTRUCTW Cs; LARGE_STRING WindowName; UNICODE_STRING ClassName; - DWORD ex_style = WS_EX_TOOLWINDOW; + DWORD ex_style = WS_EX_PALETTEWINDOW | WS_EX_DLGMODALFRAME; TRACE("owner=%p hmenu=%p\n", pWndOwner, menu); menu->spwndNotify = pWndOwner; if (flags & TPM_LAYOUTRTL || pWndOwner->ExStyle & WS_EX_LAYOUTRTL) - ex_style = WS_EX_LAYOUTRTL; + ex_style |= WS_EX_LAYOUTRTL; - ClassName.Buffer = WC_MENU; - ClassName.Length = 0; + RtlInitUnicodeString(&ClassName, WC_MENU); RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs)); - Cs.style = WS_POPUP; + Cs.style = WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER; Cs.dwExStyle = ex_style; Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.lpszName = (LPCWSTR) &WindowName;

1 0

[reactos] 01/01: [FREELDR] Fix erroneous change from d05be0da regarding RAMDISK loading in SETUPLDR.
by Hermès Bélusca-Maïto 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75623bb1fa810216ea747… commit 75623bb1fa810216ea747c8f5314aa92046902e6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 8 23:06:33 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 8 23:09:43 2019 +0200 [FREELDR] Fix erroneous change from d05be0da regarding RAMDISK loading in SETUPLDR. Restore the correct position of (optional) RAMDISK loading code, before attempting to open txtsetup.sif since the bootcd ISO might be the RAMDISK. --- boot/freeldr/freeldr/ntldr/setupldr.c | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 98b66e82f95..5342a1b0c55 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -238,6 +238,24 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions2); + /* Check if a ramdisk file was given */ + File = strstr(BootOptions2, "/RDPATH="); + if (File) + { + /* Copy the file name and everything else after it */ + RtlStringCbCopyA(FileName, sizeof(FileName), File + 8); + + /* Null-terminate */ + *strstr(FileName, " ") = ANSI_NULL; + + /* Load the ramdisk */ + if (!RamDiskLoadVirtualFile(FileName)) + { + UiMessageBox("Failed to load RAM disk file %s", FileName); + return ENOENT; + } + } + /* Check if we booted from floppy */ BootFromFloppy = strstr(BootPath, "fdisk") != NULL; @@ -293,24 +311,6 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions); - /* Check if a ramdisk file was given */ - File = strstr(BootOptions2, "/RDPATH="); - if (File) - { - /* Copy the file name and everything else after it */ - RtlStringCbCopyA(FileName, sizeof(FileName), File + 8); - - /* Null-terminate */ - *strstr(FileName, " ") = ANSI_NULL; - - /* Load the ramdisk */ - if (!RamDiskLoadVirtualFile(FileName)) - { - UiMessageBox("Failed to load RAM disk file %s", FileName); - return ENOENT; - } - } - /* Allocate and minimalist-initialize LPB */ AllocateAndInitLPB(&LoaderBlock);

1 0

[reactos] 05/05: [WIN32SS] Ensure the last menu item is not accidentally selected when a system menu is off-screen CORE-16297
by Mark Jansen 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6948764b21da483b7d0fb… commit 6948764b21da483b7d0fb6eab8dab0835525d906 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 23:53:42 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Ensure the last menu item is not accidentally selected when a system menu is off-screen CORE-16297 --- win32ss/user/ntuser/menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 724501c2c5a..a826ddbc58c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3405,6 +3405,8 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi MENU_InitSysMenuPopup(Item->spSubMenu, pWnd->style, pWnd->pcls->style, HTSYSMENU); NC_GetSysPopupPos(pWnd, &Rect); + /* Ensure we do not overlap this */ + ParentRect = Rect; if (Flags & TPM_LAYOUTRTL) Rect.left = Rect.right; Rect.top = Rect.bottom; Rect.right = UserGetSystemMetrics(SM_CXSIZE);

1 0

[reactos] 04/05: [WIN32SS] Do not propagate TPM_VERTICAL to sub-menus With this change we can remove the workaround from the off-screen menus dropping below their parent. Many thanks to Joachim for his help debugging / testing this.
by Mark Jansen 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e263ceb231c3ae46ba1… commit 84e263ceb231c3ae46ba12c5aea677ba53d8d2fa Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 22:14:58 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Do not propagate TPM_VERTICAL to sub-menus With this change we can remove the workaround from the off-screen menus dropping below their parent. Many thanks to Joachim for his help debugging / testing this. CORE-16297 --- win32ss/user/ntuser/menu.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index a4e76511431..724501c2c5a 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2879,8 +2879,10 @@ static void DebugRect(const RECT* rectl, COLORREF color) static void DebugPoint(INT x, INT y, COLORREF color) { - RECT rr = {x, y, x, y}; - DebugRect(&rr, color); + RECT r1 = {x-10, y, x+10, y}; + RECT r2 = {x, y-10, x, y+10}; + DebugRect(&r1, color); + DebugRect(&r2, color); } #endif @@ -3047,9 +3049,6 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_VERTICAL, /* Then the other side again (still swapped hor/ver) */ }; - /* We should first try left / right, this flag is not needed as input */ - UINT tryFlags = flags & ~TPM_VERTICAL; - UINT n; for (n = 0; n < RTL_NUMBER_OF(flag_mods); ++n) { @@ -3057,7 +3056,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl INT ty = y; /* Try to move a bit around */ - if (MENU_MoveRect(tryFlags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && + if (MENU_MoveRect(flags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && !RECTL_Intersect(&Cleaned, tx, ty, width, height)) { x = tx; @@ -3447,6 +3446,12 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi } } + /* Next menu does not need to be shown vertical anymore */ + if (Menu->fFlags & MNF_POPUP) + Flags &= (~TPM_VERTICAL); + + + /* use default alignment for submenus */ Flags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN); @@ -4471,7 +4476,7 @@ static BOOL FASTCALL MENU_ExitTracking(PWND pWnd, BOOL bPopup, UINT wFlags) VOID MENU_TrackMouseMenuBar( PWND pWnd, ULONG ht, POINT pt) { PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); // See 74276 and CORE-12801 - UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; + UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL; TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", pWnd, ht, pt.x, pt.y);

1 0

[reactos] 03/05: [WIN32SS] Fix tray popup menus stuck to the bottom of the screen Dedicated to Joachim CORE-16297
by Mark Jansen 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c8cdaa470c3ebce01bc4… commit 1c8cdaa470c3ebce01bc4079ca1252569870c861 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 21:50:25 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Fix tray popup menus stuck to the bottom of the screen Dedicated to Joachim CORE-16297 --- win32ss/user/ntuser/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index cc628162aee..a4e76511431 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3027,7 +3027,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* And the bottom */ if (y + height > monitor->rcMonitor.bottom) { - if ((y - height) < monitor->rcMonitor.top || y >= monitor->rcMonitor.bottom || bIsPopup) + if ((y - height) < monitor->rcMonitor.top || y >= monitor->rcMonitor.bottom) y = monitor->rcMonitor.bottom - height; else y -= height;

1 0

[reactos] 02/05: [WIN32SS] Fix off-screen menu's dropping below their parent
by Mark Jansen 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33f77af348c0aa6704f9e… commit 33f77af348c0aa6704f9ec0e9c08040dffd9f51f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 01:52:18 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Fix off-screen menu's dropping below their parent --- win32ss/user/ntuser/menu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ecf67761dd3..cc628162aee 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3046,6 +3046,10 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl TPM_VERTICAL, /* Then swap horizontal / vertical */ TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_VERTICAL, /* Then the other side again (still swapped hor/ver) */ }; + + /* We should first try left / right, this flag is not needed as input */ + UINT tryFlags = flags & ~TPM_VERTICAL; + UINT n; for (n = 0; n < RTL_NUMBER_OF(flag_mods); ++n) { @@ -3053,7 +3057,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl INT ty = y; /* Try to move a bit around */ - if (MENU_MoveRect(flags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && + if (MENU_MoveRect(tryFlags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && !RECTL_Intersect(&Cleaned, tx, ty, width, height)) { x = tx; @@ -3361,6 +3365,9 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi ERR("No pWnd\n"); ParentRect = Rect; } + + /* Ensure we can slightly overlap our parent */ + RECTL_vInflateRect(&ParentRect, -UserGetSystemMetrics(SM_CXEDGE) * 2, 0); } else {

1 0

[reactos] 01/05: [WIN32SS] For application menu's, only exclude the menu item, not the entire window. Because the application menu is part of the application window, this would lead to bad results.
by Mark Jansen 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cbdcc6363666db43ec82… commit 3cbdcc6363666db43ec82cd119f7f2536470fa93 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 00:50:21 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:15 2019 +0200 [WIN32SS] For application menu's, only exclude the menu item, not the entire window. Because the application menu is part of the application window, this would lead to bad results. --- win32ss/user/ntuser/menu.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 13af632520d..ecf67761dd3 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3354,10 +3354,20 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi pWnd = ValidateHwndNoErr(Menu->hWnd); /* Grab the rect of our (entire) parent menu, so we can try to not overlap it */ - if (!IntGetWindowRect(pWnd, &ParentRect)) + if (Menu->fFlags & MNF_POPUP) { - ERR("No pWnd\n"); - ParentRect = Rect; + if (!IntGetWindowRect(pWnd, &ParentRect)) + { + ERR("No pWnd\n"); + ParentRect = Rect; + } + } + else + { + /* Inside the menu bar, we do not want to grab the entire window... */ + ParentRect = Rect; + if (pWnd) + RECTL_vOffsetRect(&ParentRect, pWnd->rcWindow.left, pWnd->rcWindow.top); } /* correct item if modified as a reaction to WM_INITMENUPOPUP message */

1 0

[reactos] 01/01: [FONTVIEW] Broadcast WM_FONTCHANGE message (#1815)
by Katayama Hirofumi MZ 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7e39f7d2ad68b26cce7d… commit f7e39f7d2ad68b26cce7d3e3cbc4bf6867bd564c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 8 21:41:15 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 21:41:15 2019 +0900 [FONTVIEW] Broadcast WM_FONTCHANGE message (#1815) We have to send WM_FONTCHANGE message when the font list was changed. --- base/applications/fontview/fontview.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c index fe0bf8aa304..1deac6e8db2 100644 --- a/base/applications/fontview/fontview.c +++ b/base/applications/fontview/fontview.c @@ -515,6 +515,9 @@ MainWnd_OnInstall(HWND hwnd) /* Close the fonts key */ RegCloseKey(hKey); + /* Broadcast WM_FONTCHANGE message */ + SendMessageW(HWND_BROADCAST, WM_FONTCHANGE, 0, 0); + /* if all of this goes correctly, message the user about success */ MessageBoxW(hwnd, L"Font Installation Completed.", L"Success", MB_OK);

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