Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [CODEOWNERS] Add more language groups to translations auto-assignment

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ab6b35565ace38568079… commit 1ab6b35565ace385680799ef4f496d539413c390 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Apr 26 17:58:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Apr 26 17:58:52 2020 +0300 [CODEOWNERS] Add more language groups to translations auto-assignment --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 120982d5282..e83c7a754a7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -326,4 +326,6 @@ amd64/ @tkreuzer # Translations de-DE.rc @reactos/lang-german +fr-FR.rc @reactos/lang-french nl-NL.rc @reactos/lang-dutch +ru-RU.rc @reactos/lang-russian

4 years, 8 months

[reactos] 01/01: [INTL.CPL] Polish translation update (#2665)

by Adam Stachowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49e7649730d61cd7c4837… commit 49e7649730d61cd7c4837386635b029cadd1a805 Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Sun Apr 26 16:48:46 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 16:48:46 2020 +0200 [INTL.CPL] Polish translation update (#2665) After PR #2654 --- dll/cpl/intl/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/intl/lang/pl-PL.rc b/dll/cpl/intl/lang/pl-PL.rc index 4d5a832b97d..b6a0861e76a 100644 --- a/dll/cpl/intl/lang/pl-PL.rc +++ b/dll/cpl/intl/lang/pl-PL.rc @@ -221,5 +221,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem z otwarciem klucza: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem z otwarciem klucza: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Nie można uruchomić input.dll" - IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" + IDS_ERROR_UNICODE "Nie można zainstalować nowego języka dla programów nie obsługujących unicode!" END

4 years, 8 months

[reactos] 01/01: [SHELL32] Implement VK_DELETE on SHBrowseForFolder (#2661)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=771457f37f0673c8fa1f6… commit 771457f37f0673c8fa1f6e11268b7b5885780813 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 26 22:06:19 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 22:06:19 2020 +0900 [SHELL32] Implement VK_DELETE on SHBrowseForFolder (#2661) Enable Del/Delete key to delete the selected folder in "Browse for Folder" dialog. You can use https://jira.reactos.org/secure/attachment/40118/getfolder.zip as a test program. CORE-7592 --- dll/win32/shell32/wine/brsfolder.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index be45792654f..cfe982d53d9 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -625,6 +625,40 @@ static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) return S_OK; } +#ifdef __REACTOS__ +static void +BrsFolder_Delete(browse_info *info, HTREEITEM selected_item) +{ + TV_ITEMW item; + TV_ITEMDATA *item_data; + SHFILEOPSTRUCTW fileop = { info->hwndTreeView }; + WCHAR szzFrom[MAX_PATH + 1]; + + /* get item_data */ + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = selected_item; + if (!SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item)) + { + ERR("TVM_GETITEMW failed\n"); + return; + } + item_data = (TV_ITEMDATA *)item.lParam; + + /* get the path */ + if (!SHGetPathFromIDListW(item_data->lpifq, szzFrom)) + { + ERR("SHGetPathFromIDListW failed\n"); + return; + } + szzFrom[lstrlenW(szzFrom) + 1] = 0; /* double NULL-terminated */ + fileop.pFrom = szzFrom; + + /* delete folder */ + fileop.fFlags = FOF_ALLOWUNDO; + fileop.wFunc = FO_DELETE; + SHFileOperationW(&fileop); +} +#endif static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydown) { HTREEITEM selected_item; @@ -643,14 +677,7 @@ static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydo case VK_DELETE: { #ifdef __REACTOS__ - /********************************************************* - FIXME: Add a proper alternative implementation for ReactOS - - NOTES: Wine makes use of the ISFHelper interface, which we - don't have in ReactOS. - It's defined in dlls/shell32/shellfolder.h and implemented - in dlls/shell32/shfldr_fs.c on Wine's side. - *********************************************************/ + BrsFolder_Delete(info, selected_item); #else const ITEMIDLIST *item_id; ISFHelper *psfhlp;

4 years, 8 months

[reactos] 04/04: [USETUP] Move loading of requested font from blue.sys to usetup

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2391e31cf0d82b3d48a11… commit 2391e31cf0d82b3d48a11bc7551b341cdc06be84 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 26 00:23:13 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 26 14:59:04 2020 +0200 [USETUP] Move loading of requested font from blue.sys to usetup --- base/setup/usetup/console.c | 66 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 8b56bbe2ef7..57b396aafde 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -44,6 +44,31 @@ static UINT LastLoadedCodepage; /* FUNCTIONS *****************************************************************/ +typedef struct _CONSOLE_CABINET_CONTEXT +{ + CABINET_CONTEXT CabinetContext; + PVOID Data; + ULONG Size; +} CONSOLE_CABINET_CONTEXT, *PCONSOLE_CABINET_CONTEXT; + +static PVOID +ConsoleCreateFileHandler( + IN PCABINET_CONTEXT CabinetContext, + IN ULONG FileSize) +{ + PCONSOLE_CABINET_CONTEXT ConsoleCabinetContext; + + ConsoleCabinetContext = (PCONSOLE_CABINET_CONTEXT)CabinetContext; + ConsoleCabinetContext->Data = RtlAllocateHeap(ProcessHeap, 0, FileSize); + if (!ConsoleCabinetContext->Data) + { + DPRINT("Failed to allocate %d bytes\n", FileSize); + return NULL; + } + ConsoleCabinetContext->Size = FileSize; + return ConsoleCabinetContext->Data; +} + BOOL WINAPI AllocConsole(VOID) @@ -667,6 +692,12 @@ WINAPI SetConsoleOutputCP( IN UINT wCodepage) { + WCHAR FontName[100]; + WCHAR FontFile[] = L"\\SystemRoot\\vgafonts.cab"; + CONSOLE_CABINET_CONTEXT ConsoleCabinetContext; + PCABINET_CONTEXT CabinetContext = &ConsoleCabinetContext.CabinetContext; + CAB_SEARCH Search; + ULONG CabStatus; HANDLE hConsoleOutput; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -676,14 +707,43 @@ SetConsoleOutputCP( hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + CabinetInitialize(CabinetContext); + CabinetSetEventHandlers(CabinetContext, + NULL, NULL, NULL, ConsoleCreateFileHandler); + CabinetSetCabinetName(CabinetContext, FontFile); + + CabStatus = CabinetOpen(CabinetContext); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("CabinetOpen('%S') returned 0x%08x\n", FontFile, CabStatus); + return FALSE; + } + + swprintf(FontName, L"%u-8x8.bin", wCodepage); + CabStatus = CabinetFindFirst(CabinetContext, FontName, &Search); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("CabinetFindFirst('%S', '%S') returned 0x%08x\n", FontFile, FontName, CabStatus); + CabinetClose(CabinetContext); + return FALSE; + } + + CabStatus = CabinetExtractFile(CabinetContext, &Search); + CabinetClose(CabinetContext); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("CabinetLoadFile('%S', '%S') returned 0x%08x\n", FontFile, FontName, CabStatus); + return FALSE; + } + Status = NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &IoStatusBlock, - IOCTL_CONSOLE_LOADFONT, - &wCodepage, - sizeof(ULONG), + IOCTL_CONSOLE_SETFONT, + ConsoleCabinetContext.Data, + ConsoleCabinetContext.Size, NULL, 0); if (!NT_SUCCESS(Status))

4 years, 8 months

[reactos] 03/04: [USETUP] Support a custom way to extract files for cabinet files

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04ec14e23ee9b7b5d0f2b… commit 04ec14e23ee9b7b5d0f2b5edecea6c819110e068 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 13 23:28:19 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 26 14:57:40 2020 +0200 [USETUP] Support a custom way to extract files for cabinet files This will be used to extract files from cabinet to memory, instead of writing them to disk. --- base/setup/usetup/spapisup/cabinet.c | 248 ++++++++++++++++++---------------- base/setup/usetup/spapisup/cabinet.h | 7 +- base/setup/usetup/spapisup/fileqsup.c | 2 +- 3 files changed, 140 insertions(+), 117 deletions(-) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 7e8450ca42c..8d8391a3250 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -1018,134 +1018,147 @@ CabinetExtractFile( DPRINT("Extracting file at uncompressed offset (0x%X) Size (%d bytes)\n", (UINT)Search->File->FileOffset, (UINT)Search->File->FileSize); - RtlInitAnsiString(&AnsiString, Search->File->FileName); - wcscpy(DestName, CabinetContext->DestPath); - UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName) * sizeof(WCHAR); - UnicodeString.Buffer = DestName + wcslen(DestName); - UnicodeString.Length = 0; - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); - - /* Create destination file, fail if it already exists */ - RtlInitUnicodeString(&UnicodeString, DestName); - - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - OBJ_CASE_INSENSITIVE, - NULL, NULL); - - NtStatus = NtCreateFile(&DestFile, - GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_CREATE, - FILE_SYNCHRONOUS_IO_NONALERT, - NULL, 0); - - if (!NT_SUCCESS(NtStatus)) + if (CabinetContext->CreateFileHandler) { - DPRINT("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); + /* Call create context */ + CurrentDestBuffer = CabinetContext->CreateFileHandler(CabinetContext, Search->File->FileSize); + if (!CurrentDestBuffer) + { + DPRINT1("CreateFileHandler() failed\n"); + return CAB_STATUS_CANNOT_CREATE; + } + } + else + { + RtlInitAnsiString(&AnsiString, Search->File->FileName); + wcscpy(DestName, CabinetContext->DestPath); + UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName) * sizeof(WCHAR); + UnicodeString.Buffer = DestName + wcslen(DestName); + UnicodeString.Length = 0; + RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); + + /* Create destination file, fail if it already exists */ + RtlInitUnicodeString(&UnicodeString, DestName); + + InitializeObjectAttributes(&ObjectAttributes, + &UnicodeString, + OBJ_CASE_INSENSITIVE, + NULL, NULL); + + NtStatus = NtCreateFile(&DestFile, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, 0); - /* If file exists, ask to overwrite file */ - if (CabinetContext->OverwriteHandler == NULL || - CabinetContext->OverwriteHandler(CabinetContext, Search->File, DestName)) + if (!NT_SUCCESS(NtStatus)) { - /* Create destination file, overwrite if it already exists */ - NtStatus = NtCreateFile(&DestFile, - GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OVERWRITE, - FILE_SYNCHRONOUS_IO_ALERT, - NULL, 0); + DPRINT("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); - if (!NT_SUCCESS(NtStatus)) + /* If file exists, ask to overwrite file */ + if (CabinetContext->OverwriteHandler == NULL || + CabinetContext->OverwriteHandler(CabinetContext, Search->File, DestName)) { - DPRINT1("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); - return CAB_STATUS_CANNOT_CREATE; + /* Create destination file, overwrite if it already exists */ + NtStatus = NtCreateFile(&DestFile, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE, + FILE_SYNCHRONOUS_IO_ALERT, + NULL, 0); + + if (!NT_SUCCESS(NtStatus)) + { + DPRINT1("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); + return CAB_STATUS_CANNOT_CREATE; + } + } + else + { + DPRINT1("File (%S) exists\n", DestName); + return CAB_STATUS_FILE_EXISTS; } } - else - { - DPRINT1("File (%S) exists\n", DestName); - return CAB_STATUS_FILE_EXISTS; - } - } - MaxDestFileSize.QuadPart = Search->File->FileSize; - NtStatus = NtCreateSection(&DestFileSection, - SECTION_ALL_ACCESS, - 0, - &MaxDestFileSize, - PAGE_READWRITE, - SEC_COMMIT, - DestFile); + MaxDestFileSize.QuadPart = Search->File->FileSize; + NtStatus = NtCreateSection(&DestFileSection, + SECTION_ALL_ACCESS, + 0, + &MaxDestFileSize, + PAGE_READWRITE, + SEC_COMMIT, + DestFile); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT1("NtCreateSection failed for %ls: %x\n", DestName, NtStatus); - Status = CAB_STATUS_NOMEMORY; - goto CloseDestFile; - } + if (!NT_SUCCESS(NtStatus)) + { + DPRINT1("NtCreateSection failed for %ls: %x\n", DestName, NtStatus); + Status = CAB_STATUS_NOMEMORY; + goto CloseDestFile; + } - DestFileBuffer = 0; - CabinetContext->DestFileSize = 0; - NtStatus = NtMapViewOfSection(DestFileSection, - NtCurrentProcess(), - &DestFileBuffer, - 0, 0, 0, - &CabinetContext->DestFileSize, - ViewUnmap, - 0, - PAGE_READWRITE); + DestFileBuffer = 0; + CabinetContext->DestFileSize = 0; + NtStatus = NtMapViewOfSection(DestFileSection, + NtCurrentProcess(), + &DestFileBuffer, + 0, 0, 0, + &CabinetContext->DestFileSize, + ViewUnmap, + 0, + PAGE_READWRITE); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT1("NtMapViewOfSection failed: %x\n", NtStatus); - Status = CAB_STATUS_NOMEMORY; - goto CloseDestFileSection; - } - - CurrentDestBuffer = DestFileBuffer; - if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, - Search->File->FileTime, - &FileTime)) - { - DPRINT1("DosDateTimeToFileTime() failed\n"); - Status = CAB_STATUS_CANNOT_WRITE; - goto UnmapDestFile; - } + if (!NT_SUCCESS(NtStatus)) + { + DPRINT1("NtMapViewOfSection failed: %x\n", NtStatus); + Status = CAB_STATUS_NOMEMORY; + goto CloseDestFileSection; + } - NtStatus = NtQueryInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); - } - else - { - memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); + CurrentDestBuffer = DestFileBuffer; + if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, + Search->File->FileTime, + &FileTime)) + { + DPRINT1("DosDateTimeToFileTime() failed\n"); + Status = CAB_STATUS_CANNOT_WRITE; + goto UnmapDestFile; + } - NtStatus = NtSetInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); + NtStatus = NtQueryInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); + DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); } - } + else + { + memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); - SetAttributesOnFile(Search->File, DestFile); + NtStatus = NtSetInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(NtStatus)) + { + DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); + } + } + + SetAttributesOnFile(Search->File, DestFile); + } /* Call extract event handler */ if (CabinetContext->ExtractHandler != NULL) @@ -1250,13 +1263,16 @@ CabinetExtractFile( Status = CAB_STATUS_SUCCESS; UnmapDestFile: - NtUnmapViewOfSection(NtCurrentProcess(), DestFileBuffer); + if (!CabinetContext->CreateFileHandler) + NtUnmapViewOfSection(NtCurrentProcess(), DestFileBuffer); CloseDestFileSection: - NtClose(DestFileSection); + if (!CabinetContext->CreateFileHandler) + NtClose(DestFileSection); CloseDestFile: - NtClose(DestFile); + if (!CabinetContext->CreateFileHandler) + NtClose(DestFile); return Status; } @@ -1316,11 +1332,13 @@ CabinetSetEventHandlers( IN PCABINET_CONTEXT CabinetContext, IN PCABINET_OVERWRITE Overwrite, IN PCABINET_EXTRACT Extract, - IN PCABINET_DISK_CHANGE DiskChange) + IN PCABINET_DISK_CHANGE DiskChange, + IN PCABINET_CREATE_FILE CreateFile) { CabinetContext->OverwriteHandler = Overwrite; CabinetContext->ExtractHandler = Extract; CabinetContext->DiskChangeHandler = DiskChange; + CabinetContext->CreateFileHandler = CreateFile; } /* diff --git a/base/setup/usetup/spapisup/cabinet.h b/base/setup/usetup/spapisup/cabinet.h index 4dfd36e7506..0ba74c9e9d6 100644 --- a/base/setup/usetup/spapisup/cabinet.h +++ b/base/setup/usetup/spapisup/cabinet.h @@ -65,6 +65,9 @@ typedef VOID (*PCABINET_DISK_CHANGE)( IN PCWSTR CabinetName, IN PCWSTR DiskLabel); +typedef PVOID (*PCABINET_CREATE_FILE)( + IN struct _CABINET_CONTEXT* CabinetContext, + IN ULONG FileSize); /* Classes */ @@ -106,6 +109,7 @@ typedef struct _CABINET_CONTEXT PCABINET_OVERWRITE OverwriteHandler; PCABINET_EXTRACT ExtractHandler; PCABINET_DISK_CHANGE DiskChangeHandler; + PCABINET_CREATE_FILE CreateFileHandler; PVOID CabinetReservedArea; } CABINET_CONTEXT, *PCABINET_CONTEXT; @@ -204,7 +208,8 @@ CabinetSetEventHandlers( IN PCABINET_CONTEXT CabinetContext, IN PCABINET_OVERWRITE Overwrite, IN PCABINET_EXTRACT Extract, - IN PCABINET_DISK_CHANGE DiskChange); + IN PCABINET_DISK_CHANGE DiskChange, + IN PCABINET_CREATE_FILE CreateFile); /* Get pointer to cabinet reserved area. NULL if none */ PVOID diff --git a/base/setup/usetup/spapisup/fileqsup.c b/base/setup/usetup/spapisup/fileqsup.c index b82fcd889d5..d6846881d96 100644 --- a/base/setup/usetup/spapisup/fileqsup.c +++ b/base/setup/usetup/spapisup/fileqsup.c @@ -117,7 +117,7 @@ SetupExtractFile( CabinetInitialize(&QueueHeader->CabinetContext); CabinetSetEventHandlers(&QueueHeader->CabinetContext, - NULL, NULL, NULL); + NULL, NULL, NULL, NULL); CabinetSetCabinetName(&QueueHeader->CabinetContext, CabinetFileName); CabStatus = CabinetOpen(&QueueHeader->CabinetContext);

4 years, 8 months

[reactos] 02/04: [USETUP] Optimize font loading

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d51c71ed7051bc65a976… commit 0d51c71ed7051bc65a976665e8a5040557ac5686 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 13 23:22:20 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 26 14:57:38 2020 +0200 [USETUP] Optimize font loading Reload a new font only if codepage changed. --- base/setup/usetup/console.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 6e647d8bfde..8b56bbe2ef7 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -40,6 +40,7 @@ static BOOLEAN InputQueueEmpty; static BOOLEAN WaitForInput; static KEYBOARD_INPUT_DATA InputDataQueue; // Only one element! static IO_STATUS_BLOCK InputIosb; +static UINT LastLoadedCodepage; /* FUNCTIONS *****************************************************************/ @@ -670,6 +671,9 @@ SetConsoleOutputCP( IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + if (wCodepage == LastLoadedCodepage) + return TRUE; + hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); Status = NtDeviceIoControlFile(hConsoleOutput, @@ -682,7 +686,11 @@ SetConsoleOutputCP( sizeof(ULONG), NULL, 0); - return NT_SUCCESS(Status); + if (!NT_SUCCESS(Status)) + return FALSE; + + LastLoadedCodepage = wCodepage; + return TRUE; }

4 years, 8 months

[reactos] 01/04: [BLUE] Add an IOCTL to directly choose which font to use (instead of codepage)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aaa416d36afafb0e44ec3… commit aaa416d36afafb0e44ec3deccd235bdf5f2f61c1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 25 21:34:16 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 26 14:54:09 2020 +0200 [BLUE] Add an IOCTL to directly choose which font to use (instead of codepage) --- drivers/setup/blue/blue.c | 53 +++++++++++++++++++++++++++-- drivers/setup/blue/blue.h | 1 + drivers/setup/blue/font.c | 22 ++++++++++++ sdk/include/reactos/drivers/blue/ntddblue.h | 1 + 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index def5049fa32..1a911689cef 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -38,6 +38,7 @@ typedef struct _DEVICE_EXTENSION USHORT Rows; /* Number of rows */ USHORT Columns; /* Number of columns */ USHORT CursorX, CursorY; /* Cursor position */ + PUCHAR FontBitfield; /* Specifies the font. If NULL, use CodePage */ ULONG CodePage; /* Specifies the font associated to this code page */ } DEVICE_EXTENSION, *PDEVICE_EXTENSION; @@ -483,8 +484,15 @@ ScrAcquireOwnership( // DeviceExtension->CursorX = min(max(DeviceExtension->CursorX, 0), DeviceExtension->Columns - 1); DeviceExtension->CursorY = min(max(DeviceExtension->CursorY, 0), DeviceExtension->Rows - 1); - /* Upload a default font for the current codepage */ - ScrLoadFontTable(DeviceExtension->CodePage); + if (DeviceExtension->FontBitfield) + { + ScrSetFont(DeviceExtension->FontBitfield); + } + else + { + /* Upload a default font for the current codepage */ + ScrLoadFontTable(DeviceExtension->CodePage); + } DPRINT("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, @@ -511,6 +519,12 @@ ScrResetScreen( DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ DeviceExtension->CursorVisible = TRUE; + if (DeviceExtension->FontBitfield) + { + ExFreePoolWithTag(DeviceExtension->FontBitfield, TAG_BLUE); + DeviceExtension->FontBitfield = NULL; + } + /* More initialization */ DeviceExtension->CharAttribute = BACKGROUND_BLUE | FOREGROUND_LIGHTGRAY; DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT | @@ -1496,6 +1510,11 @@ ScrIoControl( } ASSERT(Irp->AssociatedIrp.SystemBuffer); + if (DeviceExtension->FontBitfield) + { + ExFreePoolWithTag(DeviceExtension->FontBitfield, TAG_BLUE); + DeviceExtension->FontBitfield = NULL; + } DeviceExtension->CodePage = *(PULONG)Irp->AssociatedIrp.SystemBuffer; /* Upload a font for the codepage if needed */ @@ -1507,6 +1526,36 @@ ScrIoControl( break; } + case IOCTL_CONSOLE_SETFONT: + { + /* Validate input buffer */ + if (stk->Parameters.DeviceIoControl.InputBufferLength < 256 * 8) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + ASSERT(Irp->AssociatedIrp.SystemBuffer); + + DeviceExtension->CodePage = 0; + if (DeviceExtension->FontBitfield) + ExFreePoolWithTag(DeviceExtension->FontBitfield, TAG_BLUE); + DeviceExtension->FontBitfield = ExAllocatePoolWithTag(NonPagedPool, 256 * 8, TAG_BLUE); + if (!DeviceExtension->FontBitfield) + { + Status = STATUS_NO_MEMORY; + break; + } + RtlCopyMemory(DeviceExtension->FontBitfield, Irp->AssociatedIrp.SystemBuffer, 256 * 8); + + /* Upload the font if needed */ + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) + ScrSetFont(DeviceExtension->FontBitfield); + + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } + default: Status = STATUS_NOT_IMPLEMENTED; } diff --git a/drivers/setup/blue/blue.h b/drivers/setup/blue/blue.h index 335313abe15..3a3af7a4511 100644 --- a/drivers/setup/blue/blue.h +++ b/drivers/setup/blue/blue.h @@ -145,5 +145,6 @@ typedef struct _CFFILE #define PELDATA (PUCHAR)0x3c9 VOID ScrLoadFontTable(_In_ ULONG CodePage); +VOID ScrSetFont(_In_ PUCHAR FontBitfield); #endif /* _BLUE_PCH_ */ diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 11f2438dd73..69b3651c49d 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -62,6 +62,28 @@ ScrLoadFontTable( CloseBitPlane(); } +VOID +ScrSetFont( + _In_ PUCHAR FontBitfield) +{ + PHYSICAL_ADDRESS BaseAddress; + PUCHAR Bitplane; + + /* open bit plane for font table access */ + OpenBitPlane(); + + /* get pointer to video memory */ + BaseAddress.QuadPart = BITPLANE_BASE; + Bitplane = (PUCHAR)MmMapIoSpace(BaseAddress, 0xFFFF, MmNonCached); + + LoadFont(Bitplane, FontBitfield); + + MmUnmapIoSpace(Bitplane, 0xFFFF); + + /* close bit plane */ + CloseBitPlane(); +} + /* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS diff --git a/sdk/include/reactos/drivers/blue/ntddblue.h b/sdk/include/reactos/drivers/blue/ntddblue.h index 0d41d0f158d..1c6d22e5008 100644 --- a/sdk/include/reactos/drivers/blue/ntddblue.h +++ b/sdk/include/reactos/drivers/blue/ntddblue.h @@ -22,6 +22,7 @@ #define IOCTL_CONSOLE_DRAW CTL_CODE(FILE_DEVICE_SCREEN, 0x830, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_LOADFONT CTL_CODE(FILE_DEVICE_SCREEN, 0x840, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) +#define IOCTL_CONSOLE_SETFONT CTL_CODE(FILE_DEVICE_SCREEN, 0x841, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) /* TYPEDEFS **************************************************************/

4 years, 8 months

[reactos] 03/03: [RTL] Implement LdrpRecordUnloadEvent

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5f0b2b160c11a766aab8… commit d5f0b2b160c11a766aab87e4773e0a8c64ac8fa8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 18 13:53:02 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 14:35:51 2020 +0200 [RTL] Implement LdrpRecordUnloadEvent --- dll/ntdll/include/ntdllp.h | 3 +++ dll/ntdll/ldr/ldrapi.c | 3 +-- sdk/lib/rtl/trace.c | 52 +++++++++++++++++++++++++++++++++++++++------- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 2fe0d778279..2ec4f44d778 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -158,6 +158,9 @@ LdrpFetchAddressOfEntryPoint(PVOID ImageBase); VOID NTAPI LdrpFreeUnicodeString(PUNICODE_STRING String); +VOID NTAPI +LdrpRecordUnloadEvent(_In_ PLDR_DATA_TABLE_ENTRY LdrEntry); + VOID NTAPI LdrpGetShimEngineInterface(VOID); diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index e7fdfec0725..8c968160f30 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1449,8 +1449,7 @@ LdrUnloadDll(IN PVOID BaseAddress) /* Get the current entry */ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks); - /* FIXME: Log the Unload Event */ - //LdrpRecordUnloadEvent(LdrEntry); + LdrpRecordUnloadEvent(LdrEntry); /* Set the entry and clear it from the list */ CurrentEntry = LdrEntry; diff --git a/sdk/lib/rtl/trace.c b/sdk/lib/rtl/trace.c index f0bf4578a01..489bf5be2bf 100644 --- a/sdk/lib/rtl/trace.c +++ b/sdk/lib/rtl/trace.c @@ -11,6 +11,7 @@ #include <debug.h> static RTL_UNLOAD_EVENT_TRACE RtlpUnloadEventTrace[RTL_UNLOAD_EVENT_TRACE_NUMBER]; +static UINT RtlpUnloadEventTraceIndex = 0; /* FUNCTIONS ******************************************************************/ @@ -22,10 +23,45 @@ RtlGetUnloadEventTrace(VOID) return RtlpUnloadEventTrace; } +VOID +NTAPI +LdrpRecordUnloadEvent(_In_ PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PIMAGE_NT_HEADERS NtHeaders; + UINT Sequence = RtlpUnloadEventTraceIndex++; + UINT Index = Sequence % RTL_UNLOAD_EVENT_TRACE_NUMBER; + USHORT StringLen; + + DPRINT("LdrpRecordUnloadEvent(%wZ, %p - %p)\n", &LdrEntry->BaseDllName, LdrEntry->DllBase, + (ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage); + + RtlpUnloadEventTrace[Index].BaseAddress = LdrEntry->DllBase; + RtlpUnloadEventTrace[Index].SizeOfImage = LdrEntry->SizeOfImage; + RtlpUnloadEventTrace[Index].Sequence = Sequence; + + NtHeaders = RtlImageNtHeader(LdrEntry->DllBase); + + if (NtHeaders) + { + RtlpUnloadEventTrace[Index].TimeDateStamp = NtHeaders->FileHeader.TimeDateStamp; + RtlpUnloadEventTrace[Index].CheckSum = NtHeaders->OptionalHeader.CheckSum; + } + else + { + RtlpUnloadEventTrace[Index].TimeDateStamp = 0; + RtlpUnloadEventTrace[Index].CheckSum = 0; + } + + StringLen = min(LdrEntry->BaseDllName.Length / sizeof(WCHAR), RTL_NUMBER_OF(RtlpUnloadEventTrace[Index].ImageName)); + RtlCopyMemory(RtlpUnloadEventTrace[Index].ImageName, LdrEntry->BaseDllName.Buffer, StringLen * sizeof(WCHAR)); + if (StringLen < RTL_NUMBER_OF(RtlpUnloadEventTrace[Index].ImageName)) + RtlpUnloadEventTrace[Index].ImageName[StringLen] = 0; +} + BOOLEAN NTAPI -RtlTraceDatabaseAdd(IN PRTL_TRACE_DATABASE Database, - IN ULONG Count, +RtlTraceDatabaseAdd(IN PRTL_TRACE_DATABASE Database, + IN ULONG Count, IN PVOID *Trace, OUT OPTIONAL PRTL_TRACE_BLOCK *TraceBlock) { @@ -35,10 +71,10 @@ RtlTraceDatabaseAdd(IN PRTL_TRACE_DATABASE Database, PRTL_TRACE_DATABASE NTAPI -RtlTraceDatabaseCreate(IN ULONG Buckets, - IN OPTIONAL SIZE_T MaximumSize, - IN ULONG Flags, - IN ULONG Tag, +RtlTraceDatabaseCreate(IN ULONG Buckets, + IN OPTIONAL SIZE_T MaximumSize, + IN ULONG Flags, + IN ULONG Tag, IN OPTIONAL RTL_TRACE_HASH_FUNCTION HashFunction) { UNIMPLEMENTED; @@ -55,7 +91,7 @@ RtlTraceDatabaseDestroy(IN PRTL_TRACE_DATABASE Database) BOOLEAN NTAPI -RtlTraceDatabaseEnumerate(IN PRTL_TRACE_DATABASE Database, +RtlTraceDatabaseEnumerate(IN PRTL_TRACE_DATABASE Database, IN PRTL_TRACE_ENUMERATE TraceEnumerate, IN OUT PRTL_TRACE_BLOCK *TraceBlock) { @@ -66,7 +102,7 @@ RtlTraceDatabaseEnumerate(IN PRTL_TRACE_DATABASE Database, BOOLEAN NTAPI -RtlTraceDatabaseFind(IN PRTL_TRACE_DATABASE Database, +RtlTraceDatabaseFind(IN PRTL_TRACE_DATABASE Database, IN ULONG Count, IN PVOID *Trace, OUT OPTIONAL PRTL_TRACE_BLOCK *TraceBlock)

4 years, 8 months

[reactos] 02/03: [NTDLL_APITEST] Add a test for RtlGetUnloadEventTrace

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cce7b9c08aad08c87884… commit 7cce7b9c08aad08c87884ecec59bb07ef4fada16 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 18 13:51:37 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 14:35:51 2020 +0200 [NTDLL_APITEST] Add a test for RtlGetUnloadEventTrace --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/RtlGetUnloadEventTrace.c | 83 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 86 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 63ea01f677d..fc46b1db676 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -58,6 +58,7 @@ list(APPEND SOURCE RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c RtlGetNtProductType.c + RtlGetUnloadEventTrace.c RtlHandle.c RtlImageRvaToVa.c RtlIsNameLegalDOS8Dot3.c diff --git a/modules/rostests/apitests/ntdll/RtlGetUnloadEventTrace.c b/modules/rostests/apitests/ntdll/RtlGetUnloadEventTrace.c new file mode 100644 index 00000000000..ba0044d1fa0 --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlGetUnloadEventTrace.c @@ -0,0 +1,83 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for RtlGetUnloadEventTrace + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +PRTL_UNLOAD_EVENT_TRACE +NTAPI +RtlGetUnloadEventTrace(VOID); + +#ifndef _WIN64 +C_ASSERT(sizeof(RTL_UNLOAD_EVENT_TRACE) == 84); +C_ASSERT(sizeof(RTL_UNLOAD_EVENT_TRACE) * RTL_UNLOAD_EVENT_TRACE_NUMBER == 0x540); +#endif + +static void Test_Dump() +{ + PRTL_UNLOAD_EVENT_TRACE TraceHead, Trace; + UINT n; + + TraceHead = RtlGetUnloadEventTrace(); + for (n = 0; n < RTL_UNLOAD_EVENT_TRACE_NUMBER; ++n) + { + ULONG ExpectSequence = n ? n : RTL_UNLOAD_EVENT_TRACE_NUMBER; + + Trace = TraceHead + n; + + ok(Trace->BaseAddress != NULL, "Got no BaseAddress for %u\n", n); + ok(Trace->SizeOfImage != 0, "Got no SizeOfImage for %u\n", n); + ok(Trace->Sequence == ExpectSequence, + "Wrong Sequence: %lu instead of %lu for %u\n", Trace->Sequence, ExpectSequence, n); + ok(Trace->TimeDateStamp != 0, "Got no TimeDateStamp for %u\n", n); + ok(Trace->CheckSum != 0, "Got no CheckSum for %u\n", n); + ok(!wcscmp(Trace->ImageName, L"GetUName.dLl"), "Wrong ImageName for %u: %S\n", n, Trace->ImageName); + } +} + +#define TESTDLL "GetUName.dLl" +static void Test_LoadUnload() +{ + HMODULE mod; + static char Buffer[MAX_PATH] = {0}; + + mod = GetModuleHandleA(TESTDLL); + ok(mod == NULL, "ERROR, %s already loaded\n", TESTDLL); + + mod = LoadLibraryA(Buffer[0] ? Buffer :TESTDLL); + ok(mod != NULL, "ERROR, %s not loaded\n", TESTDLL); + + if (!Buffer[0]) + { + GetModuleFileNameA(mod, Buffer, _countof(Buffer)); + } + else + { + Buffer[0] = '\0'; + } + + FreeLibrary(mod); + + mod = GetModuleHandleA(TESTDLL); + ok(mod == NULL, "ERROR, %s still loaded\n", TESTDLL); +} + +START_TEST(RtlGetUnloadEventTrace) +{ + int n; + HMODULE Ignore; + + Ignore = LoadLibrary("user32.dll"); + + for (n = 0; n <= RTL_UNLOAD_EVENT_TRACE_NUMBER; ++n) + { + trace("Num: %u\n", n); + Test_LoadUnload(); + } + Test_Dump(); + + FreeLibrary(Ignore); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index ac2d0cd529d..b2131a07b81 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -57,6 +57,7 @@ extern void func_RtlGetFullPathName_UstrEx(void); extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlGetNtProductType(void); +extern void func_RtlGetUnloadEventTrace(void); extern void func_RtlHandle(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlIsNameLegalDOS8Dot3(void); @@ -128,6 +129,7 @@ const struct test winetest_testlist[] = { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlGetNtProductType", func_RtlGetNtProductType }, + { "RtlGetUnloadEventTrace", func_RtlGetUnloadEventTrace }, { "RtlHandle", func_RtlHandle }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 },

4 years, 8 months

[reactos] 01/03: [NDK] Fix RTL_UNLOAD_EVENT_TRACE_NUMBER

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=362f4b5915008b00632e7… commit 362f4b5915008b00632e7a87ee1ac25ff0463e5e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 18 13:50:50 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 14:35:45 2020 +0200 [NDK] Fix RTL_UNLOAD_EVENT_TRACE_NUMBER --- sdk/include/ndk/rtltypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 1fdc0a97287..74e8551c4be 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1226,7 +1226,7 @@ typedef struct _RTL_FLS_DATA // // Unload Event Trace Structure for RtlGetUnloadEventTrace // -#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 16 typedef struct _RTL_UNLOAD_EVENT_TRACE {

4 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
40
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 April 2020