Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [NTOBJSHEX] StringCbCopy*() need sizeof(), not _countof() (#2066)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5ab9cb723cb38e6227f8… commit f5ab9cb723cb38e6227f80c9fb7b05d611d32de6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 20 15:41:08 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 20 15:41:08 2019 +0100 [NTOBJSHEX] StringCbCopy*() need sizeof(), not _countof() (#2066) And use explicit StringCbCopyW(). --- dll/shellext/ntobjshex/foldercommon.h | 4 ++-- dll/shellext/ntobjshex/ntobjfolder.cpp | 8 ++++---- dll/shellext/ntobjshex/regfolder.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/shellext/ntobjshex/foldercommon.h b/dll/shellext/ntobjshex/foldercommon.h index ae04fd40d85..23c2fed3a1a 100644 --- a/dll/shellext/ntobjshex/foldercommon.h +++ b/dll/shellext/ntobjshex/foldercommon.h @@ -179,7 +179,7 @@ public: WCHAR path[MAX_PATH]; - StringCbCopyW(path, _countof(path), m_NtPath); + StringCbCopyW(path, sizeof(path), m_NtPath); PathAppendW(path, info->entryName); LPITEMIDLIST first = ILCloneFirst(pidl); @@ -635,7 +635,7 @@ public: { m_shellPidl = ILClone(pidl); - StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\"); + StringCbCopyW(m_NtPath, sizeof(m_NtPath), L"\\"); return S_OK; } diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp index 38a4cabadd7..fa0526dd2bb 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -148,7 +148,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::ResolveSymLink( if (link.Buffer[1] == L':' && isalphaW(link.Buffer[0])) { - StringCbCopyNW(path, _countof(path), link.Buffer, link.Length); + StringCbCopyNW(path, sizeof(path), link.Buffer, link.Length); CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); @@ -158,7 +158,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::ResolveSymLink( return psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, fullPidl, NULL); } - StringCbCopyW(path, _countof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"); + StringCbCopyW(path, sizeof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"); PathAppend(path, link.Buffer); CComPtr<IShellFolder> psfDesktop; @@ -202,7 +202,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { m_shellPidl = ILClone(pidl); - StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\"); + StringCbCopyW(m_NtPath, sizeof(m_NtPath), L"\\"); return S_OK; } @@ -212,7 +212,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PC { m_shellPidl = ILClone(pidl); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + StringCbCopyW(m_NtPath, sizeof(m_NtPath), ntPath); return S_OK; } diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index c75c79cb158..420091edb3d 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -141,7 +141,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl) m_shellPidl = ILClone(pidl); m_hRoot = NULL; - StringCbCopy(m_NtPath, _countof(m_NtPath), L""); + StringCbCopyW(m_NtPath, sizeof(m_NtPath), L""); return S_OK; } @@ -150,7 +150,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PC m_shellPidl = ILClone(pidl); m_hRoot = hRoot; - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + StringCbCopyW(m_NtPath, sizeof(m_NtPath), ntPath); return S_OK; }

4 years, 11 months

[reactos] 01/01: [NTGDI][FONT] Don't rely FT_FaceRec.style_name (#2064)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8821421a42c9f00a077c… commit f8821421a42c9f00a077c0a640d53a50985174c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 22:49:51 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 20 22:49:51 2019 +0900 [NTGDI][FONT] Don't rely FT_FaceRec.style_name (#2064) - Delete ItalicFromStyle and WeightFromStyle functions. - Don't use FT_FaceRec.style_name for font style but pOS2->fsSelection, pOS2->usWeightClass, WinFNT.italic and WinFNT.weight. - Don't use the bitmap glyph as possible if the glyph will be oblique'd. - Tahoma Italic is working! CORE-9614 --- win32ss/gdi/ntgdi/freetype.c | 138 ++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 86 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 0fd08a4fa04..31bbf37fc7b 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1043,62 +1043,6 @@ IntLoadSystemFonts(VOID) } } -static BYTE -ItalicFromStyle(const char *style_name) -{ - if (style_name == NULL || style_name[0] == 0) - return FALSE; - if (strstr(style_name, "Italic") != NULL) - return TRUE; - if (strstr(style_name, "Oblique") != NULL) - return TRUE; - return FALSE; -} - -static LONG -WeightFromStyle(const char *style_name) -{ - if (style_name == NULL || style_name[0] == 0) - return FW_NORMAL; - if (strstr(style_name, "Regular") != NULL) - return FW_REGULAR; - if (strstr(style_name, "Normal") != NULL) - return FW_NORMAL; - if (strstr(style_name, "SemiBold") != NULL) - return FW_SEMIBOLD; - if (strstr(style_name, "UltraBold") != NULL) - return FW_ULTRABOLD; - if (strstr(style_name, "DemiBold") != NULL) - return FW_DEMIBOLD; - if (strstr(style_name, "ExtraBold") != NULL) - return FW_EXTRABOLD; - if (strstr(style_name, "Bold") != NULL) - return FW_BOLD; - if (strstr(style_name, "UltraLight") != NULL) - return FW_ULTRALIGHT; - if (strstr(style_name, "ExtraLight") != NULL) - return FW_EXTRALIGHT; - if (strstr(style_name, "Light") != NULL) - return FW_LIGHT; - if (strstr(style_name, "Hairline") != NULL) - return 50; - if (strstr(style_name, "Book") != NULL) - return 350; - if (strstr(style_name, "ExtraBlack") != NULL) - return 950; - if (strstr(style_name, "UltraBlack") != NULL) - return 1000; - if (strstr(style_name, "Black") != NULL) - return FW_BLACK; - if (strstr(style_name, "Medium") != NULL) - return FW_MEDIUM; - if (strstr(style_name, "Thin") != NULL) - return FW_THIN; - if (strstr(style_name, "Heavy") != NULL) - return FW_HEAVY; - return FW_NORMAL; -} - static FT_Error IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight); @@ -1279,11 +1223,32 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) /* Set face */ FontGDI->SharedFace = SharedFace; FontGDI->CharSet = ANSI_CHARSET; - FontGDI->OriginalItalic = ItalicFromStyle(Face->style_name); + FontGDI->OriginalItalic = FALSE; FontGDI->RequestItalic = FALSE; - FontGDI->OriginalWeight = WeightFromStyle(Face->style_name); + FontGDI->OriginalWeight = FW_NORMAL; FontGDI->RequestWeight = FW_NORMAL; + IntLockFreeType(); + if (FT_IS_SFNT(Face)) + { + pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(Face, FT_SFNT_OS2); + if (pOS2) + { + FontGDI->OriginalItalic = !!(pOS2->fsSelection & 0x1); + FontGDI->OriginalWeight = pOS2->usWeightClass; + } + } + else + { + Error = FT_Get_WinFNT_Header(Face, &WinFNT); + if (!Error) + { + FontGDI->OriginalItalic = !!WinFNT.italic; + FontGDI->OriginalWeight = WinFNT.weight; + } + } + IntUnLockFreeType(); + /* Entry->FaceName */ RtlInitAnsiString(&AnsiString, Face->family_name); Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiString, TRUE); @@ -4445,7 +4410,10 @@ TextIntGetTextExtentPoint(PDC dc, if (EmuBold || EmuItalic || !realglyph) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (EmuItalic) + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); + else + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); @@ -5073,23 +5041,20 @@ GetFontPenalty(const LOGFONTW * LogFont, GOT_PENALTY("SizeSynth", 50); } - if (!!LogFont->lfItalic != !!TM->tmItalic) + if (!LogFont->lfItalic && TM->tmItalic) { - if (!LogFont->lfItalic && ItalicFromStyle(style_name)) - { - /* Italic Penalty 4 */ - /* Requested font and candidate font do not agree on italic status, - and the desired result cannot be simulated. */ - /* Adjusted to 40 to satisfy (Oblique Penalty > Book Penalty). */ - GOT_PENALTY("Italic", 40); - } - else if (LogFont->lfItalic && !ItalicFromStyle(style_name)) - { - /* ItalicSim Penalty 1 */ - /* Requested italic font but the candidate is not italic, - although italics can be simulated. */ - GOT_PENALTY("ItalicSim", 1); - } + /* Italic Penalty 4 */ + /* Requested font and candidate font do not agree on italic status, + and the desired result cannot be simulated. */ + /* Adjusted to 40 to satisfy (Oblique Penalty > Book Penalty). */ + GOT_PENALTY("Italic", 40); + } + else if (LogFont->lfItalic && !TM->tmItalic) + { + /* ItalicSim Penalty 1 */ + /* Requested italic font but the candidate is not italic, + although italics can be simulated. */ + GOT_PENALTY("ItalicSim", 1); } if (LogFont->lfOutPrecision == OUT_TT_PRECIS) @@ -5347,7 +5312,6 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) ULONG MatchPenalty; LOGFONTW *pLogFont; LOGFONTW SubstitutedLogFont; - FT_Face Face; if (!pTextObj) { @@ -5439,13 +5403,6 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) else FontGdi->RequestWeight = FW_NORMAL; - Face = FontGdi->SharedFace->Face; - - //FontGdi->OriginalWeight = WeightFromStyle(Face->style_name); - - if (!FontGdi->OriginalItalic) - FontGdi->OriginalItalic = ItalicFromStyle(Face->style_name); - TextObj->fl |= TEXTOBJECT_INIT; Status = STATUS_SUCCESS; } @@ -6286,7 +6243,10 @@ IntExtTextOutW( RenderMode, pmxWorldToDevice); if (!realglyph) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (EmuItalic) + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); + else + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); @@ -6381,7 +6341,10 @@ IntExtTextOutW( { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (EmuItalic) + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); + else + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); @@ -6503,7 +6466,10 @@ IntExtTextOutW( RenderMode, pmxWorldToDevice); if (!realglyph) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (EmuItalic) + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); + else + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index);

4 years, 11 months

[reactos] 01/01: [SHELL32] Improve icon selection upon right click (#2063)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79b030219ff42c1b9df0b… commit 79b030219ff42c1b9df0bcfa54bd4c6aab338b52 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 20:37:57 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 20 20:37:57 2019 +0900 [SHELL32] Improve icon selection upon right click (#2063) If the Right-Clicked item is not being selected, then reset the selection and select the Right-Clicked item. CORE-16519 --- dll/win32/shell32/CDefView.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9fd104025a5..9dc6bc98110 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1426,6 +1426,24 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (!m_hContextMenu) return E_FAIL; + if (lParam != ~0) // unless app key (menu key) was pressed + { + x = GET_X_LPARAM(lParam); + y = GET_Y_LPARAM(lParam); + + LV_HITTESTINFO hittest = { { x, y } }; + ScreenToClient(&hittest.pt); + m_ListView.HitTest(&hittest); + + // Right-Clicked item is selected? If selected, no selection change. + // If not selected, then reset the selection and select the item. + if ((hittest.flags & LVHT_ONITEM) && + m_ListView.GetItemState(hittest.iItem, LVIS_SELECTED) != LVIS_SELECTED) + { + SelectItem(hittest.iItem, SVSI_SELECT | SVSI_DESELECTOTHERS | SVSI_ENSUREVISIBLE); + } + } + m_cidl = m_ListView.GetSelectedCount(); hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); @@ -1472,11 +1490,6 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b x = pt.x; y = pt.y; } - else - { - x = GET_X_LPARAM(lParam); - y = GET_Y_LPARAM(lParam); - } uCommand = TrackPopupMenu(m_hContextMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON,

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.21

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=871d322f922c6ecc2cdd1… commit 871d322f922c6ecc2cdd11f68ddb85b923a7fe6c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 18:58:08 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 20 18:58:08 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.21 Tahoma font. Version 0.013 khmz. 12px CYRILLIC CAPITAL LETTER EF. 12px CYRILLIC CAPITAL LETTER EN WITH DESCENDER. 12px CYRILLIC CAPITAL LETTER GHE WITH STROKE. 12px CYRILLIC CAPITAL LETTER HA. 12px CYRILLIC CAPITAL LETTER I WITH GRAVE. 12px CYRILLIC CAPITAL LETTER JE. 12px CYRILLIC CAPITAL LETTER KA WITH DESCENDER. 12px CYRILLIC CAPITAL LETTER KJE. 12px CYRILLIC CAPITAL LETTER SHA. 12px CYRILLIC CAPITAL LETTER SHCHA. 12px CYRILLIC CAPITAL LETTER SHORT U. 12px CYRILLIC CAPITAL LETTER U. 12px CYRILLIC CAPITAL LETTER YU. 12px CYRILLIC CAPITAL LETTER ZE. 12px CYRILLIC CAPITAL LETTER ZHE. 12px CYRILLIC SMALL LETTER EN WITH DESCENDER. 12px CYRILLIC SMALL LETTER GHE WITH STROKE. 12px CYRILLIC SMALL LETTER IE WITH GRAVE. 12px CYRILLIC SMALL LETTER IE. 12px CYRILLIC SMALL LETTER IO. 12px CYRILLIC SMALL LETTER JE. 12px CYRILLIC SMALL LETTER KA WITH DESCENDER. 12px CYRILLIC SMALL LETTER YI. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155308 -> 155316 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 44c8cd9b448..223a7213b35 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.20

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21f4e69ee8e3809000c0a… commit 21f4e69ee8e3809000c0a3d36acccbc568177356 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 18:38:14 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 20 18:39:05 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.20 Tahoma Bold. Version 0.011 khmz. 12px CYRILLIC CAPITAL LETTER A WITH BREVE. 12px CYRILLIC CAPITAL LETTER A WITH DIAERESIS. 12px CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS. 12px CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS. 12px CYRILLIC CAPITAL LETTER EN WITH DESCENDER. 12px CYRILLIC CAPITAL LETTER KA WITH DESCENDER. 12px CYRILLIC CAPITAL LETTER O WITH DIAERESIS. 12px CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS. 12px CYRILLIC LETTER PALOCHKA. 12px CYRILLIC SMALL LETTER A IE. 12px CYRILLIC SMALL LETTER DZHE. 12px CYRILLIC SMALL LETTER E WITH DIAERESIS. 12px CYRILLIC SMALL LETTER EN WITH DESCENDER. 12px CYRILLIC SMALL LETTER I WITH DIAERESIS. 12px CYRILLIC SMALL LETTER I WITH GRAVE. 12px CYRILLIC SMALL LETTER I WITH MACRON. 12px CYRILLIC SMALL LETTER IE WITH BREVE. 12px CYRILLIC SMALL LETTER IE WITH GRAVE. 12px CYRILLIC SMALL LETTER IO. 12px CYRILLIC SMALL LETTER JE. 12px CYRILLIC SMALL LETTER KA WITH DESCENDER. 12px CYRILLIC SMALL LETTER LJE. 12px CYRILLIC SMALL LETTER NJE. 12px CYRILLIC SMALL LETTER O WITH DIAERESIS. 12px CYRILLIC SMALL LETTER UKRAINAIAN IE. 12px CYRILLIC SMALL LETTER YI. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 103c1bf1d67..a68ca150952 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: [SHELL32] Improve UI of drive formatting (#2048)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aedba8441af6dbe3da9be… commit aedba8441af6dbe3da9bee501ecd74dce851b5a1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 10:00:26 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 20 10:00:26 2019 +0900 [SHELL32] Improve UI of drive formatting (#2048) - Add stub window (StubWindow32) to the drive formatting dialog to avoid locked. - Separate the thread of drive formatting. - Move CStubWindow32 codes. CORE-12756 --- dll/win32/shell32/dialogs/fprop.cpp | 11 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 125 ++++++++++++++++++++++++++-- dll/win32/shell32/precomp.h | 11 +++ 3 files changed, 127 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp index 108f7e03aff..3cab59b1f3b 100644 --- a/dll/win32/shell32/dialogs/fprop.cpp +++ b/dll/win32/shell32/dialogs/fprop.cpp @@ -67,17 +67,6 @@ LoadPropSheetHandlers(LPCWSTR pwszPath, PROPSHEETHEADERW *pHeader, UINT cMaxPage return cPages; } -// CStubWindow32 --- The owner window of file property sheets. -// This window hides taskbar button of property sheet. -class CStubWindow32 : public CWindowImpl<CStubWindow32> -{ -public: - DECLARE_WND_CLASS_EX(_T("StubWindow32"), 0, COLOR_WINDOWTEXT) - - BEGIN_MSG_MAP(CStubWindow32) - END_MSG_MAP() -}; - /************************************************************************* * * SH_ShowPropertiesDialog diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 35f6a7d735a..53c1b94dbaa 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -4,7 +4,7 @@ * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied * Copyright 2009 Andrew Hill - * Copyright 2017-2018 Katayama Hirofumi MZ + * Copyright 2017-2019 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,7 @@ */ #include <precomp.h> +#include <process.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); @@ -141,6 +142,119 @@ static BOOL DoEjectDrive(const WCHAR *physical, UINT nDriveType, INT *pnStringID return bResult; } +// A callback function for finding the stub windows. +static BOOL CALLBACK +EnumStubProc(HWND hwnd, LPARAM lParam) +{ + CSimpleArray<HWND> *pStubs = reinterpret_cast<CSimpleArray<HWND> *>(lParam); + + WCHAR szClass[64]; + GetClassNameW(hwnd, szClass, _countof(szClass)); + + if (lstrcmpiW(szClass, L"StubWindow32") == 0) + { + pStubs->Add(hwnd); + } + + return TRUE; +} + +// Another callback function to find the owned window of the stub window. +static BOOL CALLBACK +EnumStubProc2(HWND hwnd, LPARAM lParam) +{ + HWND *phwnd = reinterpret_cast<HWND *>(lParam); + + if (phwnd[0] == GetWindow(hwnd, GW_OWNER)) + { + phwnd[1] = hwnd; + return FALSE; + } + + return TRUE; +} + +// Parameters for format_drive_thread function below. +struct THREAD_PARAMS +{ + UINT nDriveNumber; +}; + +static unsigned __stdcall format_drive_thread(void *args) +{ + THREAD_PARAMS *params = (THREAD_PARAMS *)args; + UINT nDriveNumber = params->nDriveNumber; + LONG_PTR nProp = nDriveNumber | 0x7F00; + + // Search the stub windows that already exist. + CSimpleArray<HWND> old_stubs; + EnumWindows(EnumStubProc, (LPARAM)&old_stubs); + + for (INT n = 0; n < old_stubs.GetSize(); ++n) + { + HWND hwndStub = old_stubs[n]; + + // The target stub window has the prop. + if (GetPropW(hwndStub, L"DriveNumber") == (HANDLE)nProp) + { + // Found. + HWND ahwnd[2]; + ahwnd[0] = hwndStub; + ahwnd[1] = NULL; + EnumWindows(EnumStubProc2, (LPARAM)ahwnd); + + // Activate. + BringWindowToTop(ahwnd[1]); + + delete params; + return 0; + } + } + + // Create a stub window. + DWORD style = WS_DISABLED | WS_CLIPSIBLINGS | WS_CAPTION; + DWORD exstyle = WS_EX_WINDOWEDGE | WS_EX_APPWINDOW; + CStubWindow32 stub; + if (!stub.Create(NULL, NULL, NULL, style, exstyle)) + { + ERR("StubWindow32 creation failed\n"); + delete params; + return 0; + } + + // Add prop to the target stub window. + SetPropW(stub, L"DriveNumber", (HANDLE)nProp); + + // Do format. + SHFormatDrive(stub, nDriveNumber, SHFMT_ID_DEFAULT, 0); + + // Clean up. + RemovePropW(stub, L"DriveNumber"); + stub.DestroyWindow(); + delete params; + + return 0; +} + +static HRESULT DoFormatDrive(HWND hwnd, UINT nDriveNumber) +{ + THREAD_PARAMS *params = new THREAD_PARAMS; + params->nDriveNumber = nDriveNumber; + + // Create thread to avoid locked. + unsigned tid; + HANDLE hThread = (HANDLE)_beginthreadex(NULL, 0, format_drive_thread, params, 0, &tid); + if (hThread == NULL) + { + delete params; + return E_FAIL; + } + + CloseHandle(hThread); + + return S_OK; +} + HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, HWND hwnd, IDataObject *pdtobj, @@ -226,14 +340,7 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, { if (wParam == CMDID_FORMAT) { - /* do format */ - DWORD dwRet = SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); - switch (dwRet) - { - case SHFMT_ERROR: case SHFMT_CANCEL: case SHFMT_NOFORMAT: - hr = E_FAIL; - break; - } + hr = DoFormatDrive(hwnd, szDrive[0] - 'A'); } else if (wParam == CMDID_EJECT) { diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index c58886e49ef..071a5c7b160 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -126,4 +126,15 @@ AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam) HRESULT WINAPI Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj); +// CStubWindow32 --- The owner window of file property sheets. +// This window hides taskbar button of property sheet. +class CStubWindow32 : public CWindowImpl<CStubWindow32> +{ +public: + DECLARE_WND_CLASS_EX(_T("StubWindow32"), 0, COLOR_WINDOWTEXT) + + BEGIN_MSG_MAP(CStubWindow32) + END_MSG_MAP() +}; + #endif /* _PRECOMP_H__ */

4 years, 11 months

[reactos] 01/01: [USER32_APITEST] Power to DM_REPOSITION testcase (#2055)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a93f61fcb5c46d2960b4… commit 2a93f61fcb5c46d2960b49cd9f6166b4ead26b12 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 09:23:32 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 20 09:23:32 2019 +0900 [USER32_APITEST] Power to DM_REPOSITION testcase (#2055) - Add the minimized case. - Add a test for WS_DISPLAYCHANGE message. CORE-16490 --- modules/rostests/apitests/user32/DM_REPOSITION.c | 41 ++++++++++++++++++++-- modules/rostests/apitests/user32/user32_apitest.rc | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/user32/DM_REPOSITION.c b/modules/rostests/apitests/user32/DM_REPOSITION.c index 70d7c9e7632..f61aff4c3f2 100644 --- a/modules/rostests/apitests/user32/DM_REPOSITION.c +++ b/modules/rostests/apitests/user32/DM_REPOSITION.c @@ -10,10 +10,11 @@ static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) { - RECT rc, rcWork; - INT cx, cy; + RECT rc, rc2, rcWork; + INT cx, cy, nBitsPixel; HMONITOR hMon; MONITORINFO mi = { sizeof(mi) }; + HDC hdc; /* get monitor info */ hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); @@ -63,6 +64,42 @@ static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) ok_long(rc.right, rc.left + cx); ok_long(rc.bottom, rc.top + cy); + /* minimize */ + ShowWindow(hwnd, SW_MINIMIZE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + + /* reposition */ + ok_int(SendMessageW(hwnd, DM_REPOSITION, 0, 0), 0); + ok_int(GetWindowRect(hwnd, &rc2), TRUE); + ok_int(EqualRect(&rc, &rc2), TRUE); + + /* restore */ + ShowWindow(hwnd, SW_RESTORE); + + /* move */ + ok_int(SetWindowPos(hwnd, NULL, + rcWork.right - cx + 80, rcWork.bottom - cy + 80, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOOWNERZORDER | + SWP_NOZORDER), TRUE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx + 80); + ok_long(rc.top, rcWork.bottom - cy + 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* WM_DISPLAYCHANGE */ + hdc = GetWindowDC(hwnd); + nBitsPixel = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(hwnd, hdc); + SendMessageW(hwnd, WM_DISPLAYCHANGE, nBitsPixel, + MAKELONG(GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN))); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx + 80); + ok_long(rc.top, rcWork.bottom - cy + 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + /* quit */ PostMessage(hwnd, WM_COMMAND, IDOK, 0); return TRUE; diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index 8f56c8c8647..6c7cfe5ec81 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg" } REPOSITION DIALOG 0, 0, 200, 150 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE WS_OVERLAPPEDWINDOW CAPTION "DM_REPOSITION" FONT 8, "MS Shell Dlg" {

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.19

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4de09812736b9ff6ba36… commit e4de09812736b9ff6ba36cad36df0365f4e49c2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 20 09:13:55 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 20 09:13:55 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.19 Tahoma Bold. Version 0.010 khmz. 12px LATIN SMALL LETTER F. 12px LATIN SMALL LETTER E WITH GRAVE. 12px LATIN SMALL LETTER E WITH ACUTE. 12px LATIN SMALL LETTER E WITH CIRCUMFLEX. 12px LATIN SMALL LETTER E WITH DIAERESIS. 12px LATIN SMALL LETTER E WITH MACRON. 12px LATIN SMALL LETTER E WITH BREVE. 12px LATIN SMALL LETTER E WITH DOT ABOVE. 12px LATIN SMALL LETTER E WITH OGONEK. 12px LATIN SMALL LETTER E WITH CARON. 12px CYRILLIC CAPITAL LETTER ZHE. 12px CYRILLIC CAPITAL LETTER EF. 12px CYRILLIC CAPITAL LETTER CHE. 12px CYRILLIC CAPITAL LETTER YERU. 12px CYRILLIC CAPTIAL LETTER YU. 12px CYRILLIC CAPITAL LETTER SHCHA. 12px CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS. 12px CYRILLIC SMALL LETTER ZHE WITH DIAERESIS. 12px CYRILLIC SMALL LETTER ZHE WITH BREVE. 12px CYRILLIC SMALL LETTER IE WITH BREVE. 12px CYRILLIC SMALL LETTER E. 12px CYRILLIC SMALL LETTER HARD SIGN. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index c527b28c786..103c1bf1d67 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: [CDROM] Forcibly declare our CD devices to the MountMgr

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0917815efaece8672bfcf… commit 0917815efaece8672bfcf0aa52cec6cecf692233 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 19 19:04:55 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 19 19:05:23 2019 +0100 [CDROM] Forcibly declare our CD devices to the MountMgr --- drivers/storage/class/cdrom/cdrom.c | 126 ++++++++++++++++++++++++++++++++++ drivers/storage/class/cdrom/precomp.h | 2 + 2 files changed, 128 insertions(+) diff --git a/drivers/storage/class/cdrom/cdrom.c b/drivers/storage/class/cdrom/cdrom.c index a1c477ef9e5..220eb1fcf4f 100644 --- a/drivers/storage/class/cdrom/cdrom.c +++ b/drivers/storage/class/cdrom/cdrom.c @@ -731,6 +731,130 @@ Return Value: RtlFreeUnicodeString(&unicodeString); } + +VOID +NTAPI +ReportToMountMgr( + IN PDEVICE_OBJECT CdDeviceObject + ) + +/*++ + +Routine Description: + + This routine reports the creation of a cdrom device object to the + MountMgr to fake PnP. + +Arguments: + + CdDeviceObject - Pointer to the created cdrom device. + +Return Value: + + VOID + +--*/ +{ + NTSTATUS status; + UNICODE_STRING mountMgrDevice; + PDEVICE_OBJECT deviceObject; + PFILE_OBJECT fileObject; + PMOUNTMGR_TARGET_NAME mountTarget; + ULONG cdLen; + PDEVICE_EXTENSION deviceExtension; + PIRP irp; + KEVENT event; + IO_STATUS_BLOCK ioStatus; + + // + // First, get MountMgr DeviceObject. + // + + RtlInitUnicodeString(&mountMgrDevice, MOUNTMGR_DEVICE_NAME); + status = IoGetDeviceObjectPointer(&mountMgrDevice, FILE_READ_ATTRIBUTES, + &fileObject, &deviceObject); + + if (!NT_SUCCESS(status)) { + + DebugPrint((1, + "ReportToMountMgr: Can't get MountMgr pointers %lx\n", + status)); + + return; + } + + deviceExtension = CdDeviceObject->DeviceExtension; + cdLen = deviceExtension->DeviceName.Length; + + // + // Allocate input buffer to report our partition device. + // + + mountTarget = ExAllocatePool(NonPagedPool, + sizeof(MOUNTMGR_TARGET_NAME) + cdLen); + + if (!mountTarget) { + + DebugPrint((1, + "ReportToMountMgr: Allocation of mountTarget failed\n")); + + ObDereferenceObject(fileObject); + return; + } + + mountTarget->DeviceNameLength = cdLen; + RtlCopyMemory(mountTarget->DeviceName, deviceExtension->DeviceName.Buffer, cdLen); + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + // + // Build the IRP used to communicate with the MountMgr. + // + + irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION, + deviceObject, + mountTarget, + sizeof(MOUNTMGR_TARGET_NAME) + cdLen, + NULL, + 0, + FALSE, + &event, + &ioStatus); + + if (!irp) { + + DebugPrint((1, + "ReportToMountMgr: Allocation of irp failed\n")); + + ExFreePool(mountTarget); + ObDereferenceObject(fileObject); + return; + } + + // + // Call the MountMgr. + // + + status = IoCallDriver(deviceObject, irp); + + if (status == STATUS_PENDING) { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + status = ioStatus.Status; + } + + // + // We're done. + // + + DPRINT1("Reported to the MountMgr: %lx\n", status); + + ExFreePool(mountTarget); + ObDereferenceObject(fileObject); + + return; +} + + NTSTATUS NTAPI CreateCdRomDeviceObject( @@ -1323,6 +1447,8 @@ Return Value: ExFreePool(buffer); + ReportToMountMgr(deviceObject); + // // Start the timer now regardless of if Autorun is enabled. // The timer must run forever since IoStopTimer faults. diff --git a/drivers/storage/class/cdrom/precomp.h b/drivers/storage/class/cdrom/precomp.h index 25e00ea68ef..586ddfa59fc 100644 --- a/drivers/storage/class/cdrom/precomp.h +++ b/drivers/storage/class/cdrom/precomp.h @@ -3,5 +3,7 @@ #include <ntdef.h> #include <ntstatus.h> +#include <mountmgr.h> +#include <mountdev.h> #endif /* _CDROM_PCH_ */

4 years, 11 months

[reactos] 01/01: [MSGINA][TRANSLATION] Improve Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fb33d4c984713f390164… commit 2fb33d4c984713f390164df373a8c5b73fa202c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 23:25:54 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 19 23:25:54 2019 +0900 [MSGINA][TRANSLATION] Improve Japanese translation --- dll/win32/msgina/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index ab1f5a3b502..a2917d66ed4 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -218,9 +218,9 @@ BEGIN IDS_SHUTDOWN_SLEEP "スリープ" IDS_SHUTDOWN_HIBERNATE "休止" /* Shut down descriptions */ - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." - IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." - IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." - IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." + IDS_SHUTDOWN_LOGOFF_DESC "現在のセッションを終了し、他のユーザーがシステムにログオンできるようにします。" + IDS_SHUTDOWN_SHUTDOWN_DESC "現在のセッションを終了し、安全に電源が切れるようシステムをシャットダウンします。" + IDS_SHUTDOWN_RESTART_DESC "現在のセッションを終了し、システムを再起動します。" + IDS_SHUTDOWN_SLEEP_DESC "システムをスリープモードにします。" + IDS_SHUTDOWN_HIBERNATE_DESC "現在のセッションを保存し、コンピュータをシャットダウンします。" END

4 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019