Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [FREELDR] debug.h: Add an explicit VOID parameter type (#4133)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30010a5aa750b64528ebb… commit 30010a5aa750b64528ebb2dca85ecfd7c3484f13 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Dec 3 03:14:44 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 3 03:14:44 2021 +0100 [FREELDR] debug.h: Add an explicit VOID parameter type (#4133) Addendum to 98c17d3. --- boot/freeldr/freeldr/include/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 247b8840647..e85582f8cea 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -44,7 +44,7 @@ ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); - VOID DebugDisableScreenPort(); + VOID DebugDisableScreenPort(VOID); VOID DbgParseDebugChannels(PCHAR Value); #define ERR_LEVEL 0x1

3 years

[reactos] 01/01: [TRANSLATION][WORDPAD] Translate Wordpad to Croatian (#4098)

by Andrej Bartulin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52c75521a6093e5358de4… commit 52c75521a6093e5358de44c7333cdb27b3955347 Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Thu Dec 2 20:08:45 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 20:08:45 2021 +0100 [TRANSLATION][WORDPAD] Translate Wordpad to Croatian (#4098) --- base/applications/wordpad/lang/hr-HR.rc | 258 ++++++++++++++++++++++++++++++++ base/applications/wordpad/rsrc.rc | 3 + 2 files changed, 261 insertions(+) diff --git a/base/applications/wordpad/lang/hr-HR.rc b/base/applications/wordpad/lang/hr-HR.rc new file mode 100644 index 00000000000..86bdfeba1e7 --- /dev/null +++ b/base/applications/wordpad/lang/hr-HR.rc @@ -0,0 +1,258 @@ +/* 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 + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU +BEGIN + POPUP "&Datoteka" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Otvori...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Spremi\tCtrl+S", ID_FILE_SAVE + MENUITEM "Spremi &kao...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Ispiši...\tCtrl+P", ID_PRINT + MENUITEM "Ispiši &pregled", ID_PREVIEW + MENUITEM "Postavljanje stranic&e", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Iz&ađi", ID_FILE_EXIT + END + POPUP "&Uredi" + BEGIN + MENUITEM "&Poništi\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Vrati\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Izreži\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiraj\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Zalijepi\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Iz&briši\tDel", ID_EDIT_CLEAR + MENUITEM "&Označi sve\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "P&ronađi...\tCtrl+F", ID_FIND + MENUITEM "Pronađi &slijedeće\tF3", ID_FIND_NEXT + MENUITEM "Z&amijeni...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Pročitaj-samo &način", ID_EDIT_READONLY + MENUITEM "&Modificirano", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Dodatno" + BEGIN + MENUITEM "&Informacije označenoga", ID_EDIT_SELECTIONINFO + MENUITEM "&Format znaka", ID_EDIT_CHARFORMAT + MENUITEM "&Definicija znakovnog formata", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Paragraf formata", ID_EDIT_PARAFORMAT + MENUITEM "Dobij &tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Pogled" + BEGIN + MENUITEM "&Alatna traka", ID_TOGGLE_TOOLBAR + MENUITEM "Traka &formatiranja", ID_TOGGLE_FORMATBAR + MENUITEM "&Ravnalo", ID_TOGGLE_RULER + MENUITEM "&Statusna traka", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opcije...", ID_VIEWPROPERTIES + END + POPUP "&Ubaci" + BEGIN + MENUITEM "&Datum i vrijeme...", ID_DATETIME + END + POPUP "&Format" + BEGIN + MENUITEM "&Font...", ID_FONTSETTINGS + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + MENUITEM "&Kartice...", ID_TABSTOPS + POPUP "&Pozadina" + BEGIN + MENUITEM "&Sustav\tCtrl+1", ID_BACK_1 + MENUITEM "&Bijelo žuta\tCtrl+2", ID_BACK_2 + END + END + POPUP "P&omoć" + BEGIN + MENUITEM "&O Wine WordPad-u", ID_ABOUT + END +END + +IDM_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Izreži", ID_EDIT_CUT + MENUITEM "&Kopiraj", ID_EDIT_COPY + MENUITEM "&Zalijepi", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + END +END + +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Crna", ID_COLOR_BLACK + MENUITEM "Boja kestena", ID_COLOR_MAROON + MENUITEM "Zelena", ID_COLOR_GREEN + MENUITEM "Boja masline", ID_COLOR_OLIVE + MENUITEM "Mornarska boja", ID_COLOR_NAVY + MENUITEM "Ljubičasta", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Siva", ID_COLOR_GRAY + MENUITEM "Srebrna", ID_COLOR_SILVER + MENUITEM "Crvena", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Žuta", ID_COLOR_YELLOW + MENUITEM "Plava", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "Bijela", ID_COLOR_WHITE + MENUITEM "Automatski", ID_COLOR_AUTOMATIC + END +END + +STRINGTABLE +BEGIN + STRING_ALL_FILES, "Svi dokumenti (*.*)" + STRING_TEXT_FILES_TXT, "Tekstni dokumenti (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekstni dokumenti (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Obogaćeni tekstni formati (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Obogaćeni tekstni dokument" + STRING_NEWFILE_TXT, "Tekstni dokument" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekstni dokument" + STRING_PRINTER_FILES_PRN, "Datoteke ispisa (*.prn)" +END + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "Lijevo" + STRING_ALIGN_RIGHT, "Desno" + STRING_ALIGN_CENTER, "Sredina" +END + +STRINGTABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opcije" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Obogaćeni teskt" +END + +STRINGTABLE +BEGIN + STRING_PREVIEW_PRINT, "Ispis" + STRING_PREVIEW_NEXTPAGE, "Sljedeća stranica" + STRING_PREVIEW_PREVPAGE, "Prethodna stranica" + STRING_PREVIEW_TWOPAGES, "Dvije stranice" + STRING_PREVIEW_ONEPAGE, "Jedna stranica" + STRING_PREVIEW_ZOOMIN, "Zumiraj" + STRING_PREVIEW_ZOOMOUT, "Odzumiraj" + STRING_PREVIEW_CLOSE, "Zatvori" + STRING_PREVIEW_PAGE, "Stranica" + STRING_PREVIEW_PAGES, "Stranice" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch (inči)" + STRING_UNITS_PT, "pt" +END + +STRINGTABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Spremi promjene u '%s'?" + STRING_SEARCH_FINISHED, "Završeno pretraživanje dokumenta." + STRING_LOAD_RICHED_FAILED, "Neuspješno učitavanje RichEdit knjižnice." + STRING_SAVE_LOSEFORMATTING, "Odabrali ste spremanje u formatu običnog teksta, što će uzrokovati gubitak cjelokupnog oblikovanja. Jeste li sigurni da to želite učiniti?" + STRING_INVALID_NUMBER, "Nevažeći format brojeva." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE dokumenti za pohranu nisu podržani." + STRING_WRITE_FAILED, "Neuspješno spremanje dokumenta." + STRING_WRITE_ACCESS_DENIED, "Nemate dopuštenje za spremanje datoteke." + STRING_OPEN_FAILED, "Neuspješno otvaranje datoteke." + STRING_OPEN_ACCESS_DENIED, "Nemate dopuštenje za otvaranje datoteke." + STRING_PRINTING_NOT_IMPLEMENTED, "Ispis nije implementiran, razvijen." + STRING_MAX_TAB_STOPS, "Ne može se dodati više od 32 tabulatora." +END + +IDD_DATETIME DIALOGEX 30, 20, 130, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Date and time" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Podražni formati",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + DEFPUSHBUTTON "U redu",IDOK,87,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOGEX 30, 20, 140, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Novo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Novi tip dokumenta",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + DEFPUSHBUTTON "U redu",IDOK,97,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Format paragrafa" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Uvlačenje", -1, 10, 10, 140, 68 + LTEXT "Lijevo", -1, 15, 22, 60, 13 + EDITTEXT IDC_PARA_LEFT, 75, 20, 65, 13 + LTEXT "Desno", -1, 15, 40, 60, 13 + EDITTEXT IDC_PARA_RIGHT, 75, 38, 65, 13 + LTEXT "Prva linija", -1, 15, 58, 60, 13 + EDITTEXT IDC_PARA_FIRST, 75, 56, 65, 13 + LTEXT "Poravnanje", -1, 15, 87, 60, 13 + COMBOBOX IDC_PARA_ALIGN, 75, 85, 65, 60, CBS_DROPDOWNLIST + DEFPUSHBUTTON "U redu", IDOK, 160, 15, 50, 15 + PUSHBUTTON "Odustani", IDCANCEL, 160, 33, 50, 15 +END + +IDD_TABSTOPS DIALOGEX 30, 20, 200, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tabulatori" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tabulatori", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Ukloni", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "U redu", IDOK, 135, 15, 58, 15 + PUSHBUTTON "Odustani", IDCANCEL, 135, 33, 58, 15 + PUSHBUTTON "Ukloni &sve", ID_TAB_EMPTY, 135, 51, 58, 15 +END + +IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110 +STYLE DS_SHELLFONT | DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Omatanje linija", -1, 5, 10, 145, 85 + RADIOBUTTON "&Nema prelamanja linija", IDC_PAGEFMT_WN, 10, 25, 138, 15 + RADIOBUTTON "Prelomi tekst uz &okvir prozora", IDC_PAGEFMT_WW, 10, 45, 138, 15 + RADIOBUTTON "Prelamanje teksta uz &marginu", IDC_PAGEFMT_WM, 10, 65, 138, 15 + GROUPBOX "Alatne trake", -1, 155, 10, 115, 85 + CHECKBOX "&Alatna traka", IDC_PAGEFMT_TB, 165, 20, 80, 15 + CHECKBOX "&Formatna traka", IDC_PAGEFMT_FB, 165, 38, 80, 15 + CHECKBOX "&Ravnalo", IDC_PAGEFMT_RU, 165, 56, 80, 15 + CHECKBOX "&Statusna traka", IDC_PAGEFMT_SB, 165, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END diff --git a/base/applications/wordpad/rsrc.rc b/base/applications/wordpad/rsrc.rc index d4e0f7f3a7a..42bd9eb4d31 100644 --- a/base/applications/wordpad/rsrc.rc +++ b/base/applications/wordpad/rsrc.rc @@ -93,6 +93,9 @@ IDC_ZOOM CURSOR "res/zoom.cur" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

3 years

[reactos] 01/01: [USETUP] Improve pt-Pt Translation (#4130)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a3af90d708e6516ee489… commit 6a3af90d708e6516ee48963206eb83a6c808778c Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Dec 2 18:57:31 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 19:57:31 2021 +0100 [USETUP] Improve pt-Pt Translation (#4130) * Remove duplicate word * Improve pt-PT translation * Fix typos --- base/setup/usetup/lang/pt-PT.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 690e5cc3362..ab895a038de 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -734,7 +734,7 @@ static MUI_ENTRY ptPTFlushPageEntries[] = { 10, 6, - "O sistema est\240 a certificar que todos os dados est\306 a ser", + "O sistema est\240 a certificar que todos os dados est\306o a ser", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptPTBootPageEntries[] = { 6, 8, - "O instalador n\306o pode instalar o ger\210nciador de inicializa\207\306o no disco", + "O instalador n\306o pode instalar o gestor de inicializa\207\306o no disco", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1009,7 +1009,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 6, 8, - "n\306o-particionados neste computador.", + "n\306o particionados neste computador.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1493,35 +1493,35 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 6, 8, - "O instalador ir\240 configurar o ger\210nciador de inicializa\207\306o", + "O instalador ir\240 configurar o gestor de inicializa\207\306o", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "Instalar o ger\210nciador de inicializa\207\306o no disco r\241gido (MBR e VBR)", + "Instalar o gestor de inicializa\207\306o no disco r\241gido (MBR e VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "Instalar o ger\210nciador de inicializa\207\306o no disco r\241gido (apenas VBR)", + "Instalar o gestor de inicializa\207\306o no disco r\241gido (apenas VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 14, - "Instalar o ger\210nciador de inicializa\207\306o numa disquete", + "Instalar o gestor de inicializa\207\306o numa disquete", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "Saltar a instala\207\306o do ger\210nciador de inicializa\207\306o", + "Saltar a instala\207\306o do gestor de inicializa\207\306o", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1753,7 +1753,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 6, 18, - "sistema de arquivos de arquivos desejado e pressione ENTER.", + "sistema de arquivos desejado e pressione ENTER.", 0 }, { @@ -2306,7 +2306,7 @@ MUI_STRING ptPTStrings[] = {STRING_REBOOTPROGRESSBAR, " O computador ir\240 reiniciar em %li segundo(s)... "}, {STRING_CONSOLEFAIL1, - "N\306o foi poss\241vel abrir o console\r\n\r\n"}, + "N\306o foi poss\241vel abrir a consola\r\n\r\n"}, {STRING_CONSOLEFAIL2, "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"}, {STRING_CONSOLEFAIL3,

3 years

[reactos] 01/01: [3DTEXT] Fix 3dtext.scr using near 100% CPU (#4125)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c9fdcb1de7faa49c2af3… commit 5c9fdcb1de7faa49c2af341631217baa7b9fe552 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Dec 2 12:55:39 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 19:55:39 2021 +0100 [3DTEXT] Fix 3dtext.scr using near 100% CPU (#4125) CORE-17866, CORE-8217 --- base/applications/screensavers/3dtext/3dtext.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/applications/screensavers/3dtext/3dtext.c b/base/applications/screensavers/3dtext/3dtext.c index c1f908ca37a..b46fcce6905 100644 --- a/base/applications/screensavers/3dtext/3dtext.c +++ b/base/applications/screensavers/3dtext/3dtext.c @@ -41,6 +41,9 @@ GLfloat extentY = 0.0f; HINSTANCE hInstance; BOOL fullscreen = FALSE; +UINT uTimerID; // SetTimer Actual ID +#define APP_TIMER 1 // Graphics Update Timer ID +#define APP_TIMER_INTERVAL (USER_TIMER_MINIMUM * 5) // Graphics Update Interval // Build Our Bitmap Font GLvoid BuildFont(GLvoid) @@ -338,12 +341,18 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) // Initialize The GL Screen Using Screen Info InitGL(Screen.right, Screen.bottom); + + // Create Graphics update timer + uTimerID = SetTimer(hWnd, APP_TIMER, APP_TIMER_INTERVAL, NULL); break; case WM_DESTROY: // Disable Fullscreen Mode ChangeDisplaySettings(NULL, 0); + // Delete the Update Timer + KillTimer(hWnd, uTimerID); + // Deletes The Font Display List KillFont(); @@ -360,6 +369,8 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_PAINT: DrawGLScene(); SwapBuffers(hDC); + // Mark this window as updated, so the OS won't ask us to update it again. + ValidateRect(hWnd, NULL); break; case WM_SIZE: // Resizing The Screen @@ -367,6 +378,11 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReSizeGLScene(LOWORD(lParam), HIWORD(lParam)); break; + case WM_TIMER: + // Used to update graphic based on timer udpate interval + InvalidateRect(hWnd, NULL, TRUE); + break; + default: // Pass Windows Messages to the default screensaver window procedure return DefScreenSaverProc(hWnd, message, wParam, lParam);

3 years

[reactos] 01/01: [WIN32K:ENG] Pass correct display name to EngpFindGraphicsDevice (#4128)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c05a45e17eda057d8b92b… commit c05a45e17eda057d8b92ba76feecf3532d8324c1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Dec 1 15:28:45 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 1 18:28:45 2021 +0300 [WIN32K:ENG] Pass correct display name to EngpFindGraphicsDevice (#4128) It actually should look like '\\.\DISPLAY<n>' (since it comes from user mode), which the function expects, and not '\\Device\\Video<n>', like done in the kernel mode. Otherwise, passing wrong name causes a mismatch. Fix the problem with video device access (failure with status 0xc0000022 when trying to open it). Hence, it also fixes the following debug log spam: 'err: Could not open device \Device\Video0, 0xc0000022'. Addendum to 77e891b8. CORE-17719 CORE-17786 --- win32ss/gdi/eng/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 12fbcd0359b..2777143bf9f 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -36,7 +36,7 @@ NTSTATUS EngpUpdateGraphicsDeviceList(VOID) { ULONG iDevNum, iVGACompatible = -1, ulMaxObjectNumber = 0; - WCHAR awcDeviceName[20]; + WCHAR awcDeviceName[20], awcWinDeviceName[20]; UNICODE_STRING ustrDeviceName; WCHAR awcBuffer[256]; NTSTATUS Status; @@ -74,7 +74,10 @@ EngpUpdateGraphicsDeviceList(VOID) { /* Create the adapter's key name */ swprintf(awcDeviceName, L"\\Device\\Video%lu", iDevNum); - RtlInitUnicodeString(&ustrDeviceName, awcDeviceName); + + /* Create the display device name */ + swprintf(awcWinDeviceName, L"\\\\.\\DISPLAY%lu", iDevNum + 1); + RtlInitUnicodeString(&ustrDeviceName, awcWinDeviceName); /* Check if the device exists already */ pGraphicsDevice = EngpFindGraphicsDevice(&ustrDeviceName, iDevNum, 0);

3 years

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 December 2021