Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [NOTEPAD] Update Ukrainian translation (#2775)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a76c7ea9fc03f896d4fb2… commit a76c7ea9fc03f896d4fb2c968121a94924daff58 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Wed May 13 15:12:22 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 15:12:22 2020 +0300 [NOTEPAD] Update Ukrainian translation (#2775) --- base/applications/notepad/lang/uk-UA.rc | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a1ebedb050f..c249c64a998 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -32,7 +32,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "В&ихід", CMD_EXIT END - POPUP "Пр&авка" + POPUP "&Редагування" BEGIN MENUITEM "С&касувати\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR @@ -62,7 +62,7 @@ BEGIN BEGIN MENUITEM "Змі&ст", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Про Блокнот", CMD_HELP_ABOUT_NOTEPAD END END @@ -70,37 +70,37 @@ END DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Налаштування сторінки" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "Перегляд", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "Папір", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "&Розмір:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "&Подача:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + GROUPBOX "Орієнтація", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Книжкова", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "П&ортретна", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Поля", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&Ліве:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "Пр&аве:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "&Верхнє:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "&Нижнє:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "Вер&хній колонтитул:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "Н&ижній колонтитул:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 + PUSHBUTTON "Допомога", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "Прин&тер...", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -143,17 +143,17 @@ BEGIN STRING_ALL_FILES "Усі файли (*.*)" STRING_TEXT_FILES_TXT "Текстові файли (*.txt)" STRING_TOOLARGE "Файл '%s' завеликий для блокнота.\n \ -Будь ласка використайте інший редактор." +Будь ласка, використайте інший редактор." STRING_NOTEXT "Ви не ввели ніякого тексту. \ -\nБудь ласка введіть що-небудь і спробуйте ще раз" +\nБудь ласка, введіть що-небудь і спробуйте ще раз" STRING_DOESNOTEXIST "Файл '%s'\nне існує\n\n \ -Хочете створити новий файл ?" +Хочете створити новий файл?" STRING_NOTSAVED "Файл '%s'\nбув змінений\n\n \ -Хочете зберегти зміни ?" - STRING_NOTFOUND "'%s' can not be found." +Хочете зберегти зміни?" + STRING_NOTFOUND "'%s' не знайдено." STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\ \nЗакрийте один або декілька додатків і повторіть спробу." - STRING_CANNOTFIND "Не можу знайти '%s'" + STRING_CANNOTFIND "Неможливо знайти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Юнікод" STRING_UNICODE_BE "Юнікод (big endian)" @@ -162,8 +162,8 @@ BEGIN STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Рядок %d, стовпчик %d" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END

4 years, 7 months

[reactos] 01/01: [SYSSETUP] Update Ukrainian translation (#2776)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f319bafc8ebed4a0da2f… commit 5f319bafc8ebed4a0da2f43d6ec4e508f25f860b Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Wed May 13 15:11:48 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 15:11:48 2020 +0300 [SYSSETUP] Update Ukrainian translation (#2776) --- dll/win32/syssetup/lang/uk-UA.rc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 0708330b63b..65f07117587 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/syssetup/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for syssetup - * TRANSLATORS: Artem Reznikov, Igor Paliychuk + * TRANSLATORS: Artem Reznikov, Igor Paliychuk, Yaroslav Kibysh */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -14,7 +14,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ласкаво просимо до майстра встановлення ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб установити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб встановити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 115, 169, 195, 17 END @@ -31,20 +31,20 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Встановлення ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Будь ласка, виберіть тип продукту:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Тип &продукту:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + LTEXT "Опис:", IDC_STATIC, 20, 102, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -54,7 +54,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Введіть своє повне ім'я і назву вашої компанії або організації.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Введіть своє повне ім'я та назву вашої організації.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Ім'я:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Організація:", IDC_STATIC, 54, 57, 44, 8 @@ -135,7 +135,7 @@ BEGIN LTEXT "Завершення встановлення ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ви успішно завершили встановлення ReactOS.\n\nПісля натиснення кнопки ""Завершити"" комп'ютер буде перезавантажений.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Потім для перезавантаження Вашого комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 + LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Для перезавантаження комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -253,10 +253,10 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_PRODUCTTITLE "Тип продукту" + IDS_PRODUCTSUBTITLE "Ви можете вибрати тип продукту. Це вплине на поведінку системи." + IDS_PRODUCTSERVERNAME "Сервер ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Робоча станція ReactOS (за замовчуванням)" + IDS_PRODUCTSERVERINFO "Система буде розпізнаватися як сервер. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" не будуть залежати від папки ""Мої документи""." + IDS_PRODUCTWORKSTATIONINFO "Система буде розпізнаватися як робоча станція. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" будуть в папці ""Мої документи""." END

4 years, 7 months

[reactos] 01/01: [FTP] Don't hardcode C: drive (#2767)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=278f563e04eb6a44fb3e6… commit 278f563e04eb6a44fb3e66641d4cc14999bdcd6b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 13 13:42:18 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 13:42:18 2020 +0900 [FTP] Don't hardcode C: drive (#2767) CORE-13235 --- base/applications/network/ftp/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/base/applications/network/ftp/main.c b/base/applications/network/ftp/main.c index 44b10fb6970..f2b1c9a0bb3 100644 --- a/base/applications/network/ftp/main.c +++ b/base/applications/network/ftp/main.c @@ -227,7 +227,16 @@ int main(int argc, const char *argv[]) (void) strcpy(home, pw->pw_dir); } #endif - strcpy(home, "C:/"); + cp = getenv("SystemDrive"); + if (cp != NULL && *cp != 0) + { + strcpy(home, cp); + strcat(home, "/"); + } + else + { + strcpy(home, "C:/"); + } if (argc > 0) { if (setjmp(toplevel)) exit(0);

4 years, 7 months

[reactos] 01/01: [NtGDI] Add missing type for EPS Print Escape

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba5acbc48b48971e0e93… commit cba5acbc48b48971e0e93787221ac3f5da31eab7 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue May 12 20:34:22 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue May 12 20:34:22 2020 -0500 [NtGDI] Add missing type for EPS Print Escape Part of GDI escape printing. --- win32ss/gdi/ntgdi/dcutil.c | 5 +++++ win32ss/include/ntgdityp.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index 0ac907f0197..056fd7f2140 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -585,6 +585,11 @@ NtGdiGetAndSetDCDword( switch (u) { + case GdiGetSetEPSPrintingEscape: + SafeResult = pdc->fs & DC_EPSPRINTINGESCAPE; + pdc->fs &= ~DC_EPSPRINTINGESCAPE; + break; + case GdiGetSetCopyCount: SafeResult = pdc->ulCopyCount; pdc->ulCopyCount = dwIn; diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 748e4041034..3144df2745d 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -59,7 +59,8 @@ typedef enum _GETDCDWORD typedef enum _GETSETDCDWORD { - GdiGetSetCopyCount = 2, + GdiGetSetEPSPrintingEscape = 1, + GdiGetSetCopyCount, GdiGetSetTextAlign, GdiGetSetRelAbs, GdiGetSetTextCharExtra,

4 years, 7 months

[reactos] 01/01: [PrintUI|NTPrint] Printing Application Utility Support

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98bfe2fc89b1d3dc5a6e4… commit 98bfe2fc89b1d3dc5a6e433a320e926f5fef4474 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue May 12 20:26:02 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue May 12 20:26:02 2020 -0500 [PrintUI|NTPrint] Printing Application Utility Support PrintUI : Move to printing base directory. NTPrint : Import from wine. NTPrint does have a API test program from wine, not imported at this time. These will be Sync/Ported to full forked. --- dll/win32/CMakeLists.txt | 1 - win32ss/printing/base/CMakeLists.txt | 2 + win32ss/printing/base/ntprint/CMakeLists.txt | 15 ++ win32ss/printing/base/ntprint/ntprint.c | 156 +++++++++++++++++++++ .../printing/base/ntprint/ntprint.rc | 6 +- win32ss/printing/base/ntprint/ntprint.spec | 35 +++++ win32ss/printing/base/printui/.keep | 0 .../printing/base}/printui/CMakeLists.txt | 0 .../printing/base}/printui/printui.c | 0 .../printing/base}/printui/printui.rc | 0 .../printing/base}/printui/printui.spec | 0 .../printing/base}/printui/printui_private.h | 0 12 files changed, 211 insertions(+), 4 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index e69b50bc877..476aaec6fcb 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -157,7 +157,6 @@ add_subdirectory(olethk32) add_subdirectory(pdh) add_subdirectory(pidgen) add_subdirectory(powrprof) -add_subdirectory(printui) add_subdirectory(profmap) add_subdirectory(propsys) add_subdirectory(psapi) diff --git a/win32ss/printing/base/CMakeLists.txt b/win32ss/printing/base/CMakeLists.txt index 25ae88295bc..3101315cff1 100644 --- a/win32ss/printing/base/CMakeLists.txt +++ b/win32ss/printing/base/CMakeLists.txt @@ -1,4 +1,6 @@ #add_subdirectory(printui) +add_subdirectory(ntprint) +add_subdirectory(printui) add_subdirectory(spoolss) add_subdirectory(spoolsv) add_subdirectory(winspool) diff --git a/win32ss/printing/base/ntprint/CMakeLists.txt b/win32ss/printing/base/ntprint/CMakeLists.txt new file mode 100644 index 00000000000..f468021ff70 --- /dev/null +++ b/win32ss/printing/base/ntprint/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(ntprint.dll ntprint.spec) + +list(APPEND SOURCE + ntprint.c + ${CMAKE_CURRENT_BINARY_DIR}/ntprint_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def) + +add_library(ntprint MODULE ${SOURCE} ntprint.rc) +set_module_type(ntprint win32dll) +target_link_libraries(ntprint wine) +add_importlibs(ntprint winspool msvcrt kernel32 ntdll) +add_cd_file(TARGET ntprint DESTINATION reactos/system32 FOR all) diff --git a/win32ss/printing/base/ntprint/ntprint.c b/win32ss/printing/base/ntprint/ntprint.c new file mode 100644 index 00000000000..100385725c8 --- /dev/null +++ b/win32ss/printing/base/ntprint/ntprint.c @@ -0,0 +1,156 @@ +/* + * Implementation of the Spooler Setup API (Printing) + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winnls.h" +#include "winver.h" +#include "winspool.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntprint); + +typedef struct { + LPMONITOR_INFO_2W mi2; /* Buffer for installed Monitors */ + DWORD installed; /* Number of installed Monitors */ +} monitorinfo_t; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +/***************************************************** + * PSetupCreateMonitorInfo [NTPRINT.@] + * + * + */ + +HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) +{ + monitorinfo_t * mi=NULL; + DWORD needed; + DWORD res; + + TRACE("(%d, %s)\n", unknown1, debugstr_w(server)); + + mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); + if (!mi) { + /* FIXME: SetLastError() needed? */ + return NULL; + } + + /* Get the needed size for all Monitors */ + res = EnumMonitorsW(server, 2, NULL, 0, &needed, &mi->installed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + mi->mi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = EnumMonitorsW(server, 2, (LPBYTE) mi->mi2, needed, &needed, &mi->installed); + } + + if (!res) { + HeapFree(GetProcessHeap(), 0, mi); + return NULL; + } + + TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + return mi; +} + +/***************************************************** + * PSetupDestroyMonitorInfo [NTPRINT.@] + * + */ + +VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) +{ + monitorinfo_t * mi = monitorinfo; + + TRACE("(%p)\n", mi); + if (mi) { + if (mi->installed) HeapFree(GetProcessHeap(), 0, mi->mi2); + HeapFree(GetProcessHeap(), 0, mi); + } +} + +/***************************************************** + * PSetupEnumMonitor [NTPRINT.@] + * + * Copy the selected Monitorname to a buffer + * + * PARAMS + * monitorinfo [I] HANDLE from PSetupCreateMonitorInfo + * index [I] Nr. of the Monitorname to copy + * buffer [I] Target, that receive the Monitorname + * psize [IO] PTR to a DWORD that hold the size of the buffer and receive + * the needed size, when the buffer is too small + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * size is in Bytes on w2k and WCHAR on XP + * + */ + +BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LPDWORD psize) +{ + monitorinfo_t * mi = monitorinfo; + LPWSTR nameW; + DWORD len; + + TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + + if (index < mi->installed) { + nameW = mi->mi2[index].pName; + len = lstrlenW(nameW) + 1; + if (len <= *psize) { + memcpy(buffer, nameW, len * sizeof(WCHAR)); + TRACE("#%u: %s\n", index, debugstr_w(buffer)); + return TRUE; + } + *psize = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; +} diff --git a/dll/win32/printui/printui.rc b/win32ss/printing/base/ntprint/ntprint.rc similarity index 87% copy from dll/win32/printui/printui.rc copy to win32ss/printing/base/ntprint/ntprint.rc index bfbae9820a7..272f15159e6 100644 --- a/dll/win32/printui/printui.rc +++ b/win32ss/printing/base/ntprint/ntprint.rc @@ -1,5 +1,5 @@ /* - * Top level resource file for printui.dll + * Top level resource file for ntprint.dll * * Copyright 2007 Detlef Riekenberg * @@ -21,8 +21,8 @@ #include "winver.h" -#define WINE_FILENAME_STR "printui.dll" -#define WINE_FILEDESCRIPTION_STR "User Interface for Printing" +#define WINE_FILENAME_STR "ntprint.dll" +#define WINE_FILEDESCRIPTION_STR "Spooler Setup API (Printing)" /* Same Version as WinXP_sp2 */ #define WINE_FILEVERSION 5,1,2600,2180 diff --git a/win32ss/printing/base/ntprint/ntprint.spec b/win32ss/printing/base/ntprint/ntprint.spec new file mode 100644 index 00000000000..04e85fe72fc --- /dev/null +++ b/win32ss/printing/base/ntprint/ntprint.spec @@ -0,0 +1,35 @@ +@ stub ClassInstall32 +@ stub PSetupAssociateICMProfiles +@ stub PSetupBuildDriversFromPath +@ stub PSetupCreateDrvSetupPage +@ stdcall PSetupCreateMonitorInfo(long wstr) +@ stub PSetupCreatePrinterDeviceInfoList +@ stub PSetupDestroyDriverInfo3 +@ stdcall PSetupDestroyMonitorInfo(long) +@ stub PSetupDestroyPrinterDeviceInfoList +@ stub PSetupDestroySelectedDriverInfo +@ stub PSetupDriverInfoFromName +@ stdcall PSetupEnumMonitor(long long ptr ptr) +@ stub PSetupFreeDrvField +@ stub PSetupGetDriverInfForPrinter +@ stub PSetupGetDriverInfo3 +@ stub PSetupGetLocalDataField +@ stub PSetupGetPathToSearch +@ stub PSetupGetSelectedDriverInfo +@ stub PSetupInstallICMProfiles +@ stub PSetupInstallMonitor +@ stub PSetupInstallPrinterDriver +@ stub PSetupInstallPrinterDriverFromTheWeb +@ stub PSetupIsCompatibleDriver +@ stub PSetupIsDriverInstalled +@ stub PSetupIsMonitorInstalled +@ stub PSetupIsOemDriver +@ stub PSetupIsTheDriverFoundInInfInstalled +@ stub PSetupKillBadUserConnections +@ stub PSetupPreSelectDriver +@ stub PSetupProcessPrinterAdded +@ stub PSetupRefreshDriverList +@ stub PSetupSelectDeviceButtons +@ stub PSetupSelectDriver +@ stub PSetupSetSelectDevTitleAndInstructions +@ stub PSetupThisPlatform diff --git a/win32ss/printing/base/printui/.keep b/win32ss/printing/base/printui/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/dll/win32/printui/CMakeLists.txt b/win32ss/printing/base/printui/CMakeLists.txt similarity index 100% rename from dll/win32/printui/CMakeLists.txt rename to win32ss/printing/base/printui/CMakeLists.txt diff --git a/dll/win32/printui/printui.c b/win32ss/printing/base/printui/printui.c similarity index 100% rename from dll/win32/printui/printui.c rename to win32ss/printing/base/printui/printui.c diff --git a/dll/win32/printui/printui.rc b/win32ss/printing/base/printui/printui.rc similarity index 100% rename from dll/win32/printui/printui.rc rename to win32ss/printing/base/printui/printui.rc diff --git a/dll/win32/printui/printui.spec b/win32ss/printing/base/printui/printui.spec similarity index 100% rename from dll/win32/printui/printui.spec rename to win32ss/printing/base/printui/printui.spec diff --git a/dll/win32/printui/printui_private.h b/win32ss/printing/base/printui/printui_private.h similarity index 100% rename from dll/win32/printui/printui_private.h rename to win32ss/printing/base/printui/printui_private.h

4 years, 7 months

[reactos] 01/01: [MSAFD] Workaround regression CORE-15804

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=666fe66fe97d3d0f602fd… commit 666fe66fe97d3d0f602fd30d5f3987f980f2c934 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed May 13 02:39:37 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed May 13 02:39:37 2020 +0200 [MSAFD] Workaround regression CORE-15804 To fix 'MSTSC fails to connect with error "ERROR: Bad packet header"' which regressed by 0.4.12-dev-752-g 6bc61f63f1e0ad20ab09f881d6968558eba9a8e6 In 0.4.12 and 0.4.13 releases I totally reverted Pierre Schweitzer's work instead. Thanks to Doug Lyons, author of this new workaround, we can keep Pierre's work. We think MSAFD is a better place to workaround than our MSTSC binary, because our MSTSC runs fine on W2K3SP2. I will backport this new workaround also into 0.4.14RC. --- dll/win32/msafd/misc/dllmain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index 4f8e76c10a3..52d71e702fe 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -2890,6 +2890,10 @@ WSPSetSockOpt( return SOCKET_ERROR; } + /* FIXME: We should not have to limit the packet receive buffer size like this. workaround for CORE-15804 */ + if (*(PULONG)optval > 0x2000) + *(PULONG)optval = 0x2000; + SetSocketInformation(Socket, AFD_INFO_RECEIVE_WINDOW_SIZE, NULL,

4 years, 7 months

[reactos] 01/01: [UNIATA] Workaround regression CORE-16078, booting broke on specific Intel Z170

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c0ff7bd8484370d42991… commit 6c0ff7bd8484370d4299123be49f0e5e02de5f86 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jun 2 14:23:18 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue May 12 21:13:21 2020 +0200 [UNIATA] Workaround regression CORE-16078, booting broke on specific Intel Z170 JIRA-user "Illen" reported booting from his Z170 controller worked up to 0.4.12-dev-936-g89aaf0e and would refuse booting - beginning with uniata commit 0.4.12-dev-937-g b54613073127f5204660d9e9ab86159fea06b23e For sure this workaround is just a temporary and no proper solution, but was confirmed to be working by "Illen". We have no clear understanding of the real bug yet. Can be replaced by something better at any time. It was already committed into 0.4.12, 0.4.13, 0.4.14. We never had an affected release therefore. Since no one took care of this bug ever, the workaround will now be committed to master as well. cherry picked from commit 0.4.13-RC-9-g 11178f38e407a8d3621668295c2a28cd1ed9d7d1 --- drivers/storage/ide/uniata/bm_devs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index 5acef02a1d7..78893e42c90 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -352,7 +352,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 9d05, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 9d07, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), - PCI_DEV_HW_SPEC_BM( a102, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), +/* PCI_DEV_HW_SPEC_BM( a102, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ),*/ /* workaround regression CORE-16078 */ PCI_DEV_HW_SPEC_BM( a103, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( a105, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( a106, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER),

4 years, 7 months

[reactos] 01/01: [NTOSKRNL][HAL][BOOTVID] Some more code refactoring

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd91271796117c0f89c06… commit cd91271796117c0f89c06a6c3f66e6ba4328dd9b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat May 9 17:20:57 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue May 12 15:56:37 2020 +0300 [NTOSKRNL][HAL][BOOTVID] Some more code refactoring - Add boot video color constants - Refactor palette initialization - Move some common stuff in right place - Get rid of some magic constants and hardcoded values - Get rid of TopDelta variable (calculated at compile time) - Update SAL annotations Addendum to 5f2ca473. CORE-16216 CORE-16219 --- drivers/base/bootvid/arm/arm.h | 56 ++++--- drivers/base/bootvid/arm/bootvid.c | 167 +++++---------------- drivers/base/bootvid/common.c | 144 ++++++++++++++++-- drivers/base/bootvid/fontdata.c | 2 +- drivers/base/bootvid/i386/pc/bootvid.c | 11 +- drivers/base/bootvid/i386/pc/pc.h | 30 ++++ drivers/base/bootvid/i386/pc/vga.c | 202 ++++---------------------- drivers/base/bootvid/precomp.h | 49 +++---- hal/halx86/generic/misc.c | 6 +- ntoskrnl/inbv/inbv.c | 22 +-- ntoskrnl/kd/kdio.c | 4 +- ntoskrnl/ke/bug.c | 4 +- ntoskrnl/po/poshtdwn.c | 2 +- sdk/include/reactos/drivers/bootvid/bootvid.h | 74 ++++++---- sdk/include/reactos/drivers/bootvid/display.h | 20 +++ 15 files changed, 367 insertions(+), 426 deletions(-) diff --git a/drivers/base/bootvid/arm/arm.h b/drivers/base/bootvid/arm/arm.h index 2f46aa8fff6..7c3801c0594 100644 --- a/drivers/base/bootvid/arm/arm.h +++ b/drivers/base/bootvid/arm/arm.h @@ -23,41 +23,28 @@ extern PUSHORT VgaArmBase; #define READ_REGISTER_USHORT(r) (*(volatile USHORT * const)(r)) #define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) -PALETTE_ENTRY VidpVga8To16BitTransform[16] = -{ - {0x00, 0x00, 0x00}, // Black - {0x00, 0x00, 0x08}, // Blue - {0x00, 0x08, 0x00}, // Green - {0x00, 0x08, 0x08}, // Cyan - {0x08, 0x00, 0x00}, // Red - {0x08, 0x00, 0x08}, // Magenta - {0x0B, 0x0D, 0x0F}, // Brown - {0x10, 0x10, 0x10}, // Light Gray - {0x08, 0x08, 0x08}, // Dark Gray - {0x00, 0x00, 0x1F}, // Light Blue - {0x00, 0x1F, 0x00}, // Light Green - {0x00, 0x1F, 0x1F}, // Light Cyan - {0x1F, 0x00, 0x00}, // Light Red - {0x1F, 0x00, 0x1F}, // Light Magenta - {0x1F, 0x1F, 0x00}, // Yellow - {0x1F, 0x1F, 0x1F}, // White -}; - FORCEINLINE USHORT -VidpBuildColor(_In_ UCHAR Color) +VidpBuildColor( + _In_ UCHAR Color) { UCHAR Red, Green, Blue; /* Extract color components */ - Red = VidpVga8To16BitTransform[Color].Red; - Green = VidpVga8To16BitTransform[Color].Green; - Blue = VidpVga8To16BitTransform[Color].Blue; + Red = GetRValue(DefaultPalette[Color]) >> 3; + Green = GetGValue(DefaultPalette[Color]) >> 3; + Blue = GetBValue(DefaultPalette[Color]) >> 3; /* Build the 16-bit color mask */ return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F)); } +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count); + FORCEINLINE VOID SetPixel( @@ -73,3 +60,24 @@ SetPixel( /* Set our color */ WRITE_REGISTER_USHORT(PixelPosition, VidpBuildColor(Color)); } + +VOID +NTAPI +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore); + +VOID +NTAPI +DoScroll( + _In_ ULONG Scroll); + +VOID +NTAPI +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor); diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index c21ec620c9b..d34f08140a5 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -5,23 +5,23 @@ PUSHORT VgaArmBase; PHYSICAL_ADDRESS VgaPhysical; -BOOLEAN ClearRow = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ VOID NTAPI -DisplayCharacter(IN CHAR Character, - IN ULONG Left, - IN ULONG Top, - IN ULONG TextColor, - IN ULONG BackColor) +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor) { PUCHAR FontChar; ULONG i, j, XOffset; /* Get the font line for this character */ - FontChar = &FontData[Character * BOOTCHAR_HEIGHT - Top]; + FontChar = &VidpFontData[Character * BOOTCHAR_HEIGHT - Top]; /* Loop each pixel height */ for (i = BOOTCHAR_HEIGHT; i > 0; --i) @@ -36,7 +36,7 @@ DisplayCharacter(IN CHAR Character, /* We do, use the given Text Color */ SetPixel(XOffset, Top, (UCHAR)TextColor); } - else if (BackColor < 16) + else if (BackColor < BV_COLOR_NONE) { /* * This is a background pixel. We're drawing it @@ -56,7 +56,8 @@ DisplayCharacter(IN CHAR Character, VOID NTAPI -VgaScroll(IN ULONG Scroll) +DoScroll( + _In_ ULONG Scroll) { ULONG Top, Offset; PUSHORT SourceOffset, DestOffset; @@ -103,9 +104,10 @@ VgaScroll(IN ULONG Scroll) VOID NTAPI -PreserveRow(IN ULONG CurrentTop, - IN ULONG TopDelta, - IN BOOLEAN Restore) +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore) { PUSHORT Position1, Position2; ULONG Count; @@ -179,7 +181,8 @@ InitPaletteWithTable( */ BOOLEAN NTAPI -VidInitialize(IN BOOLEAN SetMode) +VidInitialize( + _In_ BOOLEAN SetMode) { DPRINT1("bv-arm v0.1\n"); @@ -214,7 +217,8 @@ VidInitialize(IN BOOLEAN SetMode) */ VOID NTAPI -VidResetDisplay(IN BOOLEAN HalReset) +VidResetDisplay( + _In_ BOOLEAN HalReset) { // // Clear the current position @@ -230,29 +234,8 @@ VidResetDisplay(IN BOOLEAN HalReset) // // Re-initialize the palette and fill the screen black // - //InitializePalette(); - VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); -} - -/* - * @implemented - */ -ULONG -NTAPI -VidSetTextColor(IN ULONG Color) -{ - UCHAR OldColor; - - // - // Save the old, set the new - // - OldColor = VidpTextColor; - VidpTextColor = Color; - - // - // Return the old text color - // - return OldColor; + InitializePalette(); + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); } /* @@ -271,98 +254,13 @@ VidCleanUp(VOID) */ VOID NTAPI -VidDisplayString(IN PUCHAR String) -{ - ULONG TopDelta = BOOTCHAR_HEIGHT + 1; - - /* Start looping the string */ - for (; *String; ++String) - { - /* Treat new-line separately */ - if (*String == '\n') - { - /* Modify Y position */ - VidpCurrentY += TopDelta; - if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) - { - /* Scroll the view and clear the current row */ - VgaScroll(TopDelta); - VidpCurrentY -= TopDelta; - PreserveRow(VidpCurrentY, TopDelta, TRUE); - } - else - { - /* Preserve the current row */ - PreserveRow(VidpCurrentY, TopDelta, FALSE); - } - - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - - /* No need to clear this row */ - ClearRow = FALSE; - } - else if (*String == '\r') - { - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - - /* If a new-line does not follow we will clear the current row */ - if (String[1] != '\n') ClearRow = TRUE; - } - else - { - /* Clear the current row if we had a return-carriage without a new-line */ - if (ClearRow) - { - PreserveRow(VidpCurrentY, TopDelta, TRUE); - ClearRow = FALSE; - } - - /* Display this character */ - DisplayCharacter(*String, - VidpCurrentX, - VidpCurrentY, - VidpTextColor, - 16); - VidpCurrentX += 8; - - /* Check if we should scroll */ - if (VidpCurrentX + 7 > VidpScrollRegion[2]) - { - /* Update Y position and check if we should scroll it */ - VidpCurrentY += TopDelta; - if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) - { - /* Scroll the view and clear the current row */ - VgaScroll(TopDelta); - VidpCurrentY -= TopDelta; - PreserveRow(VidpCurrentY, TopDelta, TRUE); - } - else - { - /* Preserve the current row */ - PreserveRow(VidpCurrentY, TopDelta, FALSE); - } - - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - } - } - } -} - -/* - * @implemented - */ -VOID -NTAPI -VidScreenToBufferBlt(OUT PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta) +VidScreenToBufferBlt( + _Out_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta) { UNIMPLEMENTED; while (TRUE); @@ -373,11 +271,12 @@ VidScreenToBufferBlt(OUT PUCHAR Buffer, */ VOID NTAPI -VidSolidColorFill(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom, - IN UCHAR Color) +VidSolidColorFill( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR Color) { int y, x; diff --git a/drivers/base/bootvid/common.c b/drivers/base/bootvid/common.c index 07e98eced0a..7979ea42a04 100644 --- a/drivers/base/bootvid/common.c +++ b/drivers/base/bootvid/common.c @@ -2,7 +2,7 @@ /* GLOBALS ********************************************************************/ -UCHAR VidpTextColor = 0x0F; +UCHAR VidpTextColor = BV_COLOR_WHITE; ULONG VidpCurrentX = 0; ULONG VidpCurrentY = 0; @@ -15,6 +15,33 @@ ULONG VidpScrollRegion[4] = SCREEN_HEIGHT - 1 }; +/* + * Boot video driver default palette is similar to the standard 16-color + * CGA palette, but it has Red and Blue channels swapped, and also dark + * and light gray colors swapped. + */ +const RGBQUAD VidpDefaultPalette[BV_MAX_COLORS] = +{ + RGB( 0, 0, 0), /* Black */ + RGB(128, 0, 0), /* Red */ + RGB( 0, 128, 0), /* Green */ + RGB(128, 128, 0), /* Brown */ + RGB( 0, 0, 128), /* Blue */ + RGB(128, 0, 128), /* Magenta */ + RGB( 0, 128, 128), /* Cyan */ + RGB(128, 128, 128), /* Dark Gray */ + RGB(192, 192, 192), /* Light Gray */ + RGB(255, 0, 0), /* Light Red */ + RGB( 0, 255, 0), /* Light Green */ + RGB(255, 255, 0), /* Yellow */ + RGB( 0, 0, 255), /* Light Blue */ + RGB(255, 0, 255), /* Light Magenta */ + RGB( 0, 255, 255), /* Light Cyan */ + RGB(255, 255, 255), /* White */ +}; + +static BOOLEAN ClearRow = FALSE; + /* PRIVATE FUNCTIONS **********************************************************/ static VOID @@ -272,6 +299,22 @@ RleBitBlt( /* PUBLIC FUNCTIONS ***********************************************************/ +/* + * @implemented + */ +ULONG +NTAPI +VidSetTextColor( + _In_ ULONG Color) +{ + ULONG OldColor; + + /* Save the old color and set the new one */ + OldColor = VidpTextColor; + VidpTextColor = Color; + return OldColor; +} + VOID NTAPI VidDisplayStringXY( @@ -286,13 +329,13 @@ VidDisplayStringXY( * If the caller wanted transparent, then send the special value (16), * else use our default and call the helper routine. */ - BackColor = Transparent ? 16 : 14; + BackColor = Transparent ? BV_COLOR_NONE : BV_COLOR_LIGHT_CYAN; /* Loop every character and adjust the position */ - for (; *String; ++String, Left += 8) + for (; *String; ++String, Left += BOOTCHAR_WIDTH) { /* Display a character */ - DisplayCharacter(*String, Left, Top, 12, BackColor); + DisplayCharacter(*String, Left, Top, BV_COLOR_LIGHT_BLUE, BackColor); } } @@ -305,8 +348,8 @@ VidSetScrollRegion( _In_ ULONG Bottom) { /* Assert alignment */ - ASSERT((Left & 0x7) == 0); - ASSERT((Right & 0x7) == 7); + ASSERT((Left % BOOTCHAR_WIDTH) == 0); + ASSERT((Right % BOOTCHAR_WIDTH) == BOOTCHAR_WIDTH - 1); /* Set Scroll Region */ VidpScrollRegion[0] = Left; @@ -319,6 +362,87 @@ VidSetScrollRegion( VidpCurrentY = Top; } +/* + * @implemented + */ +VOID +NTAPI +VidDisplayString( + _In_ PUCHAR String) +{ + /* Start looping the string */ + for (; *String; ++String) + { + /* Treat new-line separately */ + if (*String == '\n') + { + /* Modify Y position */ + VidpCurrentY += BOOTCHAR_HEIGHT + 1; + if (VidpCurrentY + BOOTCHAR_HEIGHT > VidpScrollRegion[3]) + { + /* Scroll the view and clear the current row */ + DoScroll(BOOTCHAR_HEIGHT + 1); + VidpCurrentY -= BOOTCHAR_HEIGHT + 1; + PreserveRow(VidpCurrentY, BOOTCHAR_HEIGHT + 1, TRUE); + } + else + { + /* Preserve the current row */ + PreserveRow(VidpCurrentY, BOOTCHAR_HEIGHT + 1, FALSE); + } + + /* Update current X */ + VidpCurrentX = VidpScrollRegion[0]; + + /* No need to clear this row */ + ClearRow = FALSE; + } + else if (*String == '\r') + { + /* Update current X */ + VidpCurrentX = VidpScrollRegion[0]; + + /* If a new-line does not follow we will clear the current row */ + if (String[1] != '\n') ClearRow = TRUE; + } + else + { + /* Clear the current row if we had a return-carriage without a new-line */ + if (ClearRow) + { + PreserveRow(VidpCurrentY, BOOTCHAR_HEIGHT + 1, TRUE); + ClearRow = FALSE; + } + + /* Display this character */ + DisplayCharacter(*String, VidpCurrentX, VidpCurrentY, VidpTextColor, BV_COLOR_NONE); + VidpCurrentX += BOOTCHAR_WIDTH; + + /* Check if we should scroll */ + if (VidpCurrentX + BOOTCHAR_WIDTH - 1 > VidpScrollRegion[2]) + { + /* Update Y position and check if we should scroll it */ + VidpCurrentY += BOOTCHAR_HEIGHT + 1; + if (VidpCurrentY + BOOTCHAR_HEIGHT > VidpScrollRegion[3]) + { + /* Scroll the view and clear the current row */ + DoScroll(BOOTCHAR_HEIGHT + 1); + VidpCurrentY -= BOOTCHAR_HEIGHT + 1; + PreserveRow(VidpCurrentY, BOOTCHAR_HEIGHT + 1, TRUE); + } + else + { + /* Preserve the current row */ + PreserveRow(VidpCurrentY, BOOTCHAR_HEIGHT + 1, FALSE); + } + + /* Update current X */ + VidpCurrentX = VidpScrollRegion[0]; + } + } + } +} + VOID NTAPI VidBufferToScreenBlt( @@ -347,14 +471,16 @@ VidBitBlt( PBITMAPINFOHEADER BitmapInfoHeader; LONG Delta; PUCHAR BitmapOffset; + ULONG PaletteCount; /* Get the Bitmap Header */ BitmapInfoHeader = (PBITMAPINFOHEADER)Buffer; /* Initialize the palette */ + PaletteCount = BitmapInfoHeader->biClrUsed ? + BitmapInfoHeader->biClrUsed : BV_MAX_COLORS; InitPaletteWithTable((PULONG)(Buffer + BitmapInfoHeader->biSize), - (BitmapInfoHeader->biClrUsed) ? - BitmapInfoHeader->biClrUsed : 16); + PaletteCount); /* Make sure we can support this bitmap */ ASSERT((BitmapInfoHeader->biBitCount * BitmapInfoHeader->biPlanes) <= 4); @@ -366,7 +492,7 @@ VidBitBlt( Delta = (BitmapInfoHeader->biBitCount * BitmapInfoHeader->biWidth) + 31; Delta >>= 3; Delta &= ~3; - BitmapOffset = Buffer + sizeof(BITMAPINFOHEADER) + 16 * sizeof(ULONG); + BitmapOffset = Buffer + sizeof(BITMAPINFOHEADER) + PaletteCount * sizeof(ULONG); /* Check the compression of the bitmap */ if (BitmapInfoHeader->biCompression == BI_RLE4) diff --git a/drivers/base/bootvid/fontdata.c b/drivers/base/bootvid/fontdata.c index 12f4a1dfe84..e4a6922bbbf 100644 --- a/drivers/base/bootvid/fontdata.c +++ b/drivers/base/bootvid/fontdata.c @@ -6,7 +6,7 @@ // Available from http://mirtchovski.com/p9/fonts/ // FontData Array generated by bootvid_font_generator. // -UCHAR FontData[256 * BOOTCHAR_HEIGHT] = +UCHAR VidpFontData[256 * BOOTCHAR_HEIGHT] = { 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 0 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 13 diff --git a/drivers/base/bootvid/i386/pc/bootvid.c b/drivers/base/bootvid/i386/pc/bootvid.c index c80911d1aba..f3336527d4a 100644 --- a/drivers/base/bootvid/i386/pc/bootvid.c +++ b/drivers/base/bootvid/i386/pc/bootvid.c @@ -4,7 +4,8 @@ static BOOLEAN NTAPI -VgaInterpretCmdStream(IN PUSHORT CmdStream) +VgaInterpretCmdStream( + _In_ PUSHORT CmdStream) { USHORT Cmd; UCHAR Major, Minor; @@ -358,7 +359,8 @@ VgaIsPresent(VOID) */ BOOLEAN NTAPI -VidInitialize(IN BOOLEAN SetMode) +VidInitialize( + _In_ BOOLEAN SetMode) { ULONG_PTR Context = 0; PHYSICAL_ADDRESS TranslatedAddress; @@ -464,7 +466,8 @@ VidInitialize(IN BOOLEAN SetMode) */ VOID NTAPI -VidResetDisplay(IN BOOLEAN HalReset) +VidResetDisplay( + _In_ BOOLEAN HalReset) { /* Clear the current position */ VidpCurrentX = 0; @@ -485,5 +488,5 @@ VidResetDisplay(IN BOOLEAN HalReset) /* Re-initialize the palette and fill the screen black */ InitializePalette(); - VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); + VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); } diff --git a/drivers/base/bootvid/i386/pc/pc.h b/drivers/base/bootvid/i386/pc/pc.h index fef2324f8b4..c1a96e797a6 100644 --- a/drivers/base/bootvid/i386/pc/pc.h +++ b/drivers/base/bootvid/i386/pc/pc.h @@ -19,6 +19,15 @@ extern UCHAR PixelMask[8]; #define __outpw(Port, Value) \ WRITE_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port)), (USHORT)(Value)) +VOID +NTAPI +InitPaletteWithTable( + _In_ PULONG Table, + _In_ ULONG Count); + +VOID +PrepareForSetPixel(VOID); + FORCEINLINE VOID SetPixel( @@ -37,3 +46,24 @@ SetPixel( /* Read the current pixel value and add our color */ WRITE_REGISTER_UCHAR(PixelPosition, READ_REGISTER_UCHAR(PixelPosition) & Color); } + +VOID +NTAPI +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore); + +VOID +NTAPI +DoScroll( + _In_ ULONG Scroll); + +VOID +NTAPI +DisplayCharacter( + _In_ CHAR Character, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG TextColor, + _In_ ULONG BackColor); diff --git a/drivers/base/bootvid/i386/pc/vga.c b/drivers/base/bootvid/i386/pc/vga.c index b2d003657ee..b985bc68eb1 100644 --- a/drivers/base/bootvid/i386/pc/vga.c +++ b/drivers/base/bootvid/i386/pc/vga.c @@ -57,13 +57,13 @@ static ULONG lookup[16] = ULONG_PTR VgaRegisterBase = 0; ULONG_PTR VgaBase = 0; -static BOOLEAN ClearRow = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ static VOID NTAPI -ReadWriteMode(IN UCHAR Mode) +ReadWriteMode( + _In_ UCHAR Mode) { UCHAR Value; @@ -98,14 +98,6 @@ do { \ WRITE_REGISTER_UCHAR((_PixelPtr), (UCHAR)(_TextColor)); \ } while (0); -#ifdef CHAR_GEN_UPSIDE_DOWN -# define GetFontPtr(_Char) &FontData[_Char * BOOTCHAR_HEIGHT] + BOOTCHAR_HEIGHT - 1; -# define FONT_PTR_DELTA (-1) -#else -# define GetFontPtr(_Char) &FontData[_Char * BOOTCHAR_HEIGHT]; -# define FONT_PTR_DELTA (1) -#endif - VOID NTAPI DisplayCharacter( @@ -156,7 +148,7 @@ DisplayCharacter( } /* Check if the background color is transparent */ - if (BackColor >= 16) + if (BackColor >= BV_COLOR_NONE) { /* We are done */ return; @@ -199,18 +191,17 @@ DisplayCharacter( static VOID NTAPI -SetPaletteEntryRGB(IN ULONG Id, - IN ULONG Rgb) +SetPaletteEntryRGB( + _In_ ULONG Id, + _In_ RGBQUAD Rgb) { - PCHAR Colors = (PCHAR)&Rgb; - /* Set the palette index */ __outpb(VGA_BASE_IO_PORT + DAC_ADDRESS_WRITE_PORT, (UCHAR)Id); /* Set RGB colors */ - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, Colors[2] >> 2); - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, Colors[1] >> 2); - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, Colors[0] >> 2); + __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, GetRValue(Rgb) >> 2); + __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, GetGValue(Rgb) >> 2); + __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, GetBValue(Rgb) >> 2); } VOID @@ -222,57 +213,16 @@ InitPaletteWithTable( ULONG i; PULONG Entry = Table; - /* Loop every entry */ for (i = 0; i < Count; i++, Entry++) { - /* Set the entry */ SetPaletteEntryRGB(i, *Entry); } } -static VOID -NTAPI -SetPaletteEntry(IN ULONG Id, - IN ULONG PaletteEntry) -{ - /* Set the palette index */ - __outpb(VGA_BASE_IO_PORT + DAC_ADDRESS_WRITE_PORT, (UCHAR)Id); - - /* Set RGB colors */ - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, PaletteEntry & 0xFF); - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, (PaletteEntry >>= 8) & 0xFF); - __outpb(VGA_BASE_IO_PORT + DAC_DATA_REG_PORT, (PaletteEntry >> 8) & 0xFF); -} - VOID NTAPI -InitializePalette(VOID) -{ - ULONG PaletteEntry[16] = {0x000000, - 0x000020, - 0x002000, - 0x002020, - 0x200000, - 0x200020, - 0x202000, - 0x202020, - 0x303030, - 0x00003F, - 0x003F00, - 0x003F3F, - 0x3F0000, - 0x3F003F, - 0x3F3F00, - 0x3F3F3F}; - ULONG i; - - /* Loop all the entries and set their palettes */ - for (i = 0; i < 16; i++) SetPaletteEntry(i, PaletteEntry[i]); -} - -static VOID -NTAPI -VgaScroll(IN ULONG Scroll) +DoScroll( + _In_ ULONG Scroll) { ULONG Top, RowSize; PUCHAR OldPosition, NewPosition; @@ -309,11 +259,12 @@ VgaScroll(IN ULONG Scroll) } } -static VOID +VOID NTAPI -PreserveRow(IN ULONG CurrentTop, - IN ULONG TopDelta, - IN BOOLEAN Restore) +PreserveRow( + _In_ ULONG CurrentTop, + _In_ ULONG TopDelta, + _In_ BOOLEAN Restore) { PUCHAR Position1, Position2; ULONG Count; @@ -360,21 +311,6 @@ PreserveRow(IN ULONG CurrentTop, /* PUBLIC FUNCTIONS **********************************************************/ -/* - * @implemented - */ -ULONG -NTAPI -VidSetTextColor(IN ULONG Color) -{ - ULONG OldColor; - - /* Save the old color and set the new one */ - OldColor = VidpTextColor; - VidpTextColor = Color; - return OldColor; -} - /* * @implemented */ @@ -392,94 +328,13 @@ VidCleanUp(VOID) */ VOID NTAPI -VidDisplayString(IN PUCHAR String) -{ - ULONG TopDelta = BOOTCHAR_HEIGHT + 1; - - /* Start looping the string */ - for (; *String; ++String) - { - /* Treat new-line separately */ - if (*String == '\n') - { - /* Modify Y position */ - VidpCurrentY += TopDelta; - if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) - { - /* Scroll the view and clear the current row */ - VgaScroll(TopDelta); - VidpCurrentY -= TopDelta; - PreserveRow(VidpCurrentY, TopDelta, TRUE); - } - else - { - /* Preserve the current row */ - PreserveRow(VidpCurrentY, TopDelta, FALSE); - } - - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - - /* No need to clear this row */ - ClearRow = FALSE; - } - else if (*String == '\r') - { - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - - /* If a new-line does not follow we will clear the current row */ - if (String[1] != '\n') ClearRow = TRUE; - } - else - { - /* Clear the current row if we had a return-carriage without a new-line */ - if (ClearRow) - { - PreserveRow(VidpCurrentY, TopDelta, TRUE); - ClearRow = FALSE; - } - - /* Display this character */ - DisplayCharacter(*String, VidpCurrentX, VidpCurrentY, VidpTextColor, 16); - VidpCurrentX += 8; - - /* Check if we should scroll */ - if (VidpCurrentX + 7 > VidpScrollRegion[2]) - { - /* Update Y position and check if we should scroll it */ - VidpCurrentY += TopDelta; - if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) - { - /* Scroll the view and clear the current row */ - VgaScroll(TopDelta); - VidpCurrentY -= TopDelta; - PreserveRow(VidpCurrentY, TopDelta, TRUE); - } - else - { - /* Preserve the current row */ - PreserveRow(VidpCurrentY, TopDelta, FALSE); - } - - /* Update current X */ - VidpCurrentX = VidpScrollRegion[0]; - } - } - } -} - -/* - * @implemented - */ -VOID -NTAPI -VidScreenToBufferBlt(OUT PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta) +VidScreenToBufferBlt( + _Out_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta) { ULONG Plane; ULONG XDistance; @@ -573,11 +428,12 @@ VidScreenToBufferBlt(OUT PUCHAR Buffer, */ VOID NTAPI -VidSolidColorFill(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom, - IN UCHAR Color) +VidSolidColorFill( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR Color) { ULONG rMask, lMask; ULONG LeftOffset, RightOffset, Distance; diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index d89e93d359e..da64ef71c86 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -41,35 +41,7 @@ typedef struct tagBITMAPINFOHEADER #define BI_RGB 0 #define BI_RLE4 2 -typedef struct _PALETTE_ENTRY -{ - UCHAR Red; - UCHAR Green; - UCHAR Blue; -} PALETTE_ENTRY, *PPALETTE_ENTRY; - -VOID -NTAPI -InitializePalette(VOID); - -VOID -NTAPI -DisplayCharacter( - _In_ CHAR Character, - _In_ ULONG Left, - _In_ ULONG Top, - _In_ ULONG TextColor, - _In_ ULONG BackColor -); - -VOID -PrepareForSetPixel(VOID); - -VOID -NTAPI -InitPaletteWithTable( - _In_ PULONG Table, - _In_ ULONG Count); +typedef ULONG RGBQUAD; /* * Globals @@ -78,6 +50,23 @@ extern UCHAR VidpTextColor; extern ULONG VidpCurrentX; extern ULONG VidpCurrentY; extern ULONG VidpScrollRegion[4]; -extern UCHAR FontData[256 * BOOTCHAR_HEIGHT]; +extern UCHAR VidpFontData[256 * BOOTCHAR_HEIGHT]; +extern const RGBQUAD VidpDefaultPalette[BV_MAX_COLORS]; + +#define RGB(r, g, b) ((RGBQUAD)(((UCHAR)(b) | ((USHORT)((UCHAR)(g))<<8)) | (((ULONG)(UCHAR)(r))<<16))) + +#define GetRValue(quad) ((UCHAR)(((quad)>>16) & 0xFF)) +#define GetGValue(quad) ((UCHAR)(((quad)>>8) & 0xFF)) +#define GetBValue(quad) ((UCHAR)((quad) & 0xFF)) + +#define InitializePalette() InitPaletteWithTable((PULONG)VidpDefaultPalette, BV_MAX_COLORS) + +#ifdef CHAR_GEN_UPSIDE_DOWN +# define GetFontPtr(_Char) &VidpFontData[_Char * BOOTCHAR_HEIGHT] + BOOTCHAR_HEIGHT - 1; +# define FONT_PTR_DELTA (-1) +#else +# define GetFontPtr(_Char) &VidpFontData[_Char * BOOTCHAR_HEIGHT]; +# define FONT_PTR_DELTA (1) +#endif #endif /* _BOOTVID_PCH_ */ diff --git a/hal/halx86/generic/misc.c b/hal/halx86/generic/misc.c index 407f1e6047a..7e1eb37d7ad 100644 --- a/hal/halx86/generic/misc.c +++ b/hal/halx86/generic/misc.c @@ -244,7 +244,7 @@ HalHandleNMI(IN PVOID NmiInfo) SystemControl.Bits = __inbyte(SYSTEM_CONTROL_PORT_B); // - // Switch to boot vieo + // Switch to boot video // if (InbvIsBootDriverInstalled()) { @@ -257,13 +257,13 @@ HalHandleNMI(IN PVOID NmiInfo) // // Fill the screen // - InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 1); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_RED); InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); // // Enable text // - InbvSetTextColor(15); + InbvSetTextColor(BV_COLOR_WHITE); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); } diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 5617e8577e2..76af14c4bd7 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -779,7 +779,7 @@ InbvUpdateProgressBar(IN ULONG Progress) ProgressBarTop, ProgressBarLeft + FillCount, ProgressBarTop + 12, - 15); + BV_COLOR_WHITE); /* Release the lock */ InbvReleaseLock(); @@ -827,7 +827,7 @@ InbvBitBlt(IN PUCHAR Buffer, VOID NTAPI -InbvScreenToBufferBlt(IN PUCHAR Buffer, +InbvScreenToBufferBlt(OUT PUCHAR Buffer, IN ULONG X, IN ULONG Y, IN ULONG Width, @@ -1021,7 +1021,7 @@ InbvRotationThread( if (Index >= 3) { /* Fill previous bar position */ - VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, 0); + VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, BV_COLOR_BLACK); } if (Index < Total - 1) { @@ -1120,9 +1120,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (SharedUserData->NtProductType == NtProductWinNt) { /* Workstation; set colors */ - InbvSetTextColor(15); - InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 7); - InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); + InbvSetTextColor(BV_COLOR_WHITE); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_DARK_GRAY); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_RED); /* Get resources */ Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); @@ -1131,9 +1131,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) else { /* Server; set colors */ - InbvSetTextColor(14); - InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 6); - InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); + InbvSetTextColor(BV_COLOR_LIGHT_CYAN); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_CYAN); + InbvSolidColorFill(0, VID_FOOTER_BG_TOP, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_RED); /* Get resources */ Header = InbvGetResourceAddress(IDB_SERVER_HEADER); @@ -1246,7 +1246,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) InbvScreenToBufferBlt(Buffer, VID_SKU_SAVE_AREA_LEFT, VID_SKU_SAVE_AREA_TOP, 7, 7, 8); InbvSolidColorFill(VID_SKU_AREA_LEFT, VID_SKU_AREA_TOP, - VID_SKU_AREA_RIGHT, VID_SKU_AREA_BOTTOM, 0); + VID_SKU_AREA_RIGHT, VID_SKU_AREA_BOTTOM, BV_COLOR_BLACK); InbvBufferToScreenBlt(Buffer, VID_SKU_SAVE_AREA_LEFT, VID_SKU_SAVE_AREA_TOP, 7, 7, 8); @@ -1390,7 +1390,7 @@ FinalizeBootLogo(VOID) if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) { /* Clear the screen */ - VidSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 0); + VidSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, BV_COLOR_BLACK); } /* Reset progress bar and lock */ diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 89ca1685f74..678a335741f 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -418,8 +418,8 @@ KdpScreenAcquire(VOID) /* Acquire ownership and reset the display */ InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); - InbvSetTextColor(15); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); + InbvSetTextColor(BV_COLOR_WHITE); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 0601855d359..38e0077d9de 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -626,8 +626,8 @@ KiDisplayBlueScreen(IN ULONG MessageId, InbvResetDisplay(); /* Display blue screen */ - InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 4); - InbvSetTextColor(15); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLUE); + InbvSetTextColor(BV_COLOR_WHITE); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 31a1165e33f..c52f8c7680b 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -162,7 +162,7 @@ PopShutdownHandler(VOID) /* Yes we do, cleanup for shutdown screen */ if (!InbvCheckDisplayOwnership()) InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); InbvEnableDisplayString(TRUE); InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); diff --git a/sdk/include/reactos/drivers/bootvid/bootvid.h b/sdk/include/reactos/drivers/bootvid/bootvid.h index 23971957f4d..6df26e96739 100644 --- a/sdk/include/reactos/drivers/bootvid/bootvid.h +++ b/sdk/include/reactos/drivers/bootvid/bootvid.h @@ -14,29 +14,34 @@ BOOLEAN NTAPI -VidInitialize(IN BOOLEAN SetMode); +VidInitialize( + _In_ BOOLEAN SetMode); VOID NTAPI -VidResetDisplay(IN BOOLEAN HalReset); +VidResetDisplay( + _In_ BOOLEAN HalReset); ULONG NTAPI -VidSetTextColor(IN ULONG Color); +VidSetTextColor( + _In_ ULONG Color); VOID NTAPI -VidDisplayStringXY(IN PUCHAR String, - IN ULONG Left, - IN ULONG Top, - IN BOOLEAN Transparent); +VidDisplayStringXY( + _In_ PUCHAR String, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ BOOLEAN Transparent); VOID NTAPI -VidSetScrollRegion(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom); +VidSetScrollRegion( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom); VOID NTAPI @@ -44,38 +49,43 @@ VidCleanUp(VOID); VOID NTAPI -VidBufferToScreenBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta); +VidBufferToScreenBlt( + _In_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta); VOID NTAPI -VidDisplayString(IN PUCHAR String); +VidDisplayString( + _In_ PUCHAR String); VOID NTAPI -VidBitBlt(IN PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top); +VidBitBlt( + _In_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top); VOID NTAPI -VidScreenToBufferBlt(OUT PUCHAR Buffer, - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Delta); +VidScreenToBufferBlt( + _Out_ PUCHAR Buffer, + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Delta); VOID NTAPI -VidSolidColorFill(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom, - IN UCHAR Color); +VidSolidColorFill( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR Color); #endif // _BOOTVID_ diff --git a/sdk/include/reactos/drivers/bootvid/display.h b/sdk/include/reactos/drivers/bootvid/display.h index af9178153ad..fc509c1fe6b 100644 --- a/sdk/include/reactos/drivers/bootvid/display.h +++ b/sdk/include/reactos/drivers/bootvid/display.h @@ -10,3 +10,23 @@ /* For default VGA */ #define SCREEN_WIDTH 640 #define SCREEN_HEIGHT 480 + +/* Boot video default color palette constants */ +#define BV_COLOR_BLACK 0 +#define BV_COLOR_RED 1 +#define BV_COLOR_GREEN 2 +#define BV_COLOR_BROWN 3 +#define BV_COLOR_BLUE 4 +#define BV_COLOR_MAGENTA 5 +#define BV_COLOR_CYAN 6 +#define BV_COLOR_DARK_GRAY 7 +#define BV_COLOR_LIGHT_GRAY 8 +#define BV_COLOR_LIGHT_RED 9 +#define BV_COLOR_LIGHT_GREEN 10 +#define BV_COLOR_YELLOW 11 +#define BV_COLOR_LIGHT_BLUE 12 +#define BV_COLOR_LIGHT_MAGENTA 13 +#define BV_COLOR_LIGHT_CYAN 14 +#define BV_COLOR_WHITE 15 +#define BV_COLOR_NONE 16 +#define BV_MAX_COLORS 16

4 years, 7 months

[reactos] 01/01: [FONTVIEW] Ensure the extension filter is properly double-null terminated

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=909f50a857559ce3c69f1… commit 909f50a857559ce3c69f1cc50d5b864357aec9c9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon May 11 20:52:30 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 11 20:52:30 2020 +0200 [FONTVIEW] Ensure the extension filter is properly double-null terminated --- base/applications/fontview/fontview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c index df5056f4b5d..8ef2a7cb98b 100644 --- a/base/applications/fontview/fontview.c +++ b/base/applications/fontview/fontview.c @@ -126,10 +126,10 @@ wWinMain(HINSTANCE hThisInstance, if (argc < 2) { OPENFILENAMEW fontOpen; - WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH]; + WCHAR filter[MAX_PATH*2] = {0}, dialogTitle[MAX_PATH]; LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle)); - LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter)); + LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter) - 1); /* Clears out any values of fontOpen before we use it */ ZeroMemory(&fontOpen, sizeof(fontOpen));

4 years, 7 months

[reactos] 01/01: [BROWSEUI] PL-pl update

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b22484b53347a5e201847… commit b22484b53347a5e20184725ef6d666797402369b Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Mon May 11 09:06:33 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 11 15:52:31 2020 +0200 [BROWSEUI] PL-pl update browseui.dll - PL-pl translation update :) --- dll/win32/browseui/lang/pl-PL.rc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 22f3ac24444..a801406ce05 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -4,6 +4,7 @@ * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) + * Polish translation updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (May, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -43,7 +44,7 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Pasek sta&nu", IDM_VIEW_STATUSBAR - POPUP "Pasek &exploratora", IDM_VIEW_EXPLORERBAR + POPUP "Pasek &eksploratora", IDM_VIEW_EXPLORERBAR BEGIN MENUITEM "W&yszukaj\tCtrl+E", IDM_EXPLORERBAR_SEARCH MENUITEM "&Ulubione\tCtrl+I", IDM_EXPLORERBAR_FAVORITES @@ -158,7 +159,7 @@ BEGIN DEFPUSHBUTTON "Wy&szukaj", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Zatrzymaj", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - AUTOCHECKBOX "Search Hidden Files and Folders", + AUTOCHECKBOX "Przeszukaj ukryte pliki i foldery", IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 @@ -226,7 +227,7 @@ END STRINGTABLE BEGIN 9121 "Podłącza dysk sieciowy." - 9122 "Odłącza dysk sieciowy." + 9122 "Odłącza wybrany dysk sieciowy." END STRINGTABLE @@ -245,8 +246,8 @@ END STRINGTABLE BEGIN - 9362 "Otwiera katalog Ulubionych." - 9363 "Dodaje bierzącą stronę do listy ulubionych." + 9362 "Otwiera katalog Ulubione." + 9363 "Dodaje bieżącą stronę do listy ulubione." END STRINGTABLE @@ -335,10 +336,10 @@ END STRINGTABLE BEGIN - IDS_SEARCH_RESULTS "Search Results" + IDS_SEARCH_RESULTS "Wyniki wyszukiwania" IDS_SEARCHINVALID "Folder '%1' jest nieprawidłowy." - IDS_SEARCH_FOLDER "Trwa wyszukiwanie %s" - IDS_SEARCH_FILES_FOUND "Znaleziono %u plików" + IDS_SEARCH_FOLDER "Trwa wyszukiwanie... %s" + IDS_SEARCH_FILES_FOUND "Znaleziono: %u plików" IDS_SEARCH_OPEN_FOLDER "O&twórz folder zawierający" IDS_COL_NAME "Nazwa" IDS_COL_LOCATION "W folderze" @@ -347,6 +348,6 @@ END STRINGTABLE BEGIN - IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TITLE "Eksplorator ReactOS" + IDS_PARSE_ADDR_ERR_TEXT "Eksplorator systemu ReactOS nie może znaleźć elementu '%1'. Sprawdź pisownię i ponów próbę." END

4 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
20
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 May 2020