Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [INTL] Update Romanian (ro-RO) translation (#6247)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37344a6dfc58ca598be73… commit 37344a6dfc58ca598be73350260982720d9dd2c2 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:25:04 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:25:04 2024 +0100 [INTL] Update Romanian (ro-RO) translation (#6247) --- dll/cpl/intl/lang/ro-RO.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/cpl/intl/lang/ro-RO.rc b/dll/cpl/intl/lang/ro-RO.rc index 5e39865bfef..98186264f0a 100644 --- a/dll/cpl/intl/lang/ro-RO.rc +++ b/dll/cpl/intl/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -14,8 +14,8 @@ CAPTION "Opțiuni regionale" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Standarde și formate", -1, 5, 5, 234, 162 - LTEXT "Această opțiune afectează modul în care numerele, valutele, data și ora sunt reprezentare în anumite aplicații.", -1, 14, 17, 220, 25 - LTEXT "Alegeți o configurație prestabilită sau specificați una particularizată pentru formatele de afișare:", -1, 14, 37, 220, 22 + LTEXT "Această opțiune afectează modul în care numerele, valutele, datele și orele sunt reprezentare în anumite aplicații.", -1, 14, 17, 220, 25 + LTEXT "Selectați un element care să se potrivească cu proprietățile sale sau dați clic pe „Personalizează” pentru a vă alege propriile formate:", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 150, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Particularizare…", IDC_SETUP_BUTTON, 168, 56, 62, 13 LTEXT "Exemple", -1, 14, 73, 70, 10 @@ -189,7 +189,7 @@ END STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Particularizarea opțiunilor regionale" - IDS_SPAIN "Spaniolă (Spainia)" + IDS_SPAIN "Spaniolă (Spania)" IDS_METRIC "Metric" IDS_IMPERIAL "Imperial" END @@ -197,13 +197,13 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Opțiuni regionale" - IDS_CPLDESCRIPTION "Configurarea limbii și formatarea numerelor, valutelor, datei și orei." + IDS_CPLDESCRIPTION "Selectează limbile și formatarea numerelor, valutelor, orelor și datei." END STRINGTABLE BEGIN - IDS_APPLY_DEFAULT_TITLE "Modificarea configurației implicite" - IDS_APPLY_DEFAULT_TEXT "Configurația va fi aplicată contului implicit de utilizator.\n\n\ + IDS_APPLY_DEFAULT_TITLE "Schimbarea setărilor implicite" + IDS_APPLY_DEFAULT_TEXT "Setările vor fi aplicate contului implicit de utilizator.\n\n\ Aceste modificări se referă la ecranul de autentificare și la noile conturi de utilizator.\n\ Calculatorul trebuie repornit pentru a institui modificări în unele servicii de sistem." END @@ -220,6 +220,6 @@ BEGIN IDS_ERROR_DEF_INT_KEY_REG "Problemă la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" IDS_ERROR_NLS_KEY_REG "Problemă la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" IDS_ERROR_NLS_CODE_REG "Problemă la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_INPUT_DLL "„input.dll” nu a putut fi încărcat!" - IDS_ERROR_UNICODE "Nu a putut fi instalată o nouă limbă pentru programele ce nu suportă Unicode!" + IDS_ERROR_INPUT_DLL "Nu s-a putut încărca „input.dll”!" + IDS_ERROR_UNICODE "Nu s-a putut instala o nouă limbă pentru programele ce nu suportă Unicode!" END

1 year, 5 months

[reactos] 01/01: [FONTVIEW] Update Romanian (ro-RO) translation (#6245)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a68b081980bf578b3c7f… commit 4a68b081980bf578b3c7f0e8f0f14811607d8931 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:24:12 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:24:12 2024 +0100 [FONTVIEW] Update Romanian (ro-RO) translation (#6245) --- base/applications/fontview/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/fontview/lang/ro-RO.rc b/base/applications/fontview/lang/ro-RO.rc index 1e42198d147..3b05736f485 100644 --- a/base/applications/fontview/lang/ro-RO.rc +++ b/base/applications/fontview/lang/ro-RO.rc @@ -18,11 +18,11 @@ BEGIN IDS_ERROR "Eroare" IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația." IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat." - IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată." + IDS_ERROR_NOCLASS "Nu s-a putut inițializa clasa de ferestre." IDS_ERROR_ISINSTALLED "Acest font este deja instalat!" - IDS_ERROR_FONTCPY "Nu a putut fi copiat acest fișier de font!" - IDS_ERROR_OPENKEY "Nu a putut fi deschisă această cheie de regiștrii a fonturilor!" - IDS_ERROR_REGISTER "Nu a putut fi înregistrat noul font!" + IDS_ERROR_FONTCPY "Nu s-a putut copia acest fișier de font!" + IDS_ERROR_OPENKEY "Nu s-a putut deschide această cheie de regiștrii a fonturilor!" + IDS_ERROR_REGISTER "Nu s-a putut înregistra noul font!" IDS_SUCCESS "Succes" IDS_COMPLETED "Instalarea fontului completă." IDS_FILTER_LIST "Toate fonturile recunoscute (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\

1 year, 5 months

[reactos] 01/01: [MSPAINT] Update Romanian (ro-RO) translation (#6241)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acf170c95dcaa7432ba7b… commit acf170c95dcaa7432ba7be54aa0b2ce129c9af1e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:22:43 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:22:43 2024 +0100 [MSPAINT] Update Romanian (ro-RO) translation (#6241) --- base/applications/mspaint/lang/ro-RO.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 5061a2a49ee..7781cdd8221 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -28,9 +28,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Transmite...", IDM_FILESEND MENUITEM SEPARATOR - MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED - MENUITEM "Decor de birou (e&xtins)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM "Fundal de desktop (în c&arou)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Fundal de desktop (&centrat)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Fundal de desktop (e&xtins)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "Cel mai recent fișier", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR @@ -266,8 +266,8 @@ BEGIN IDS_UNDERLINE "Subliniat" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" - IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Eșec în salvarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s" - IDS_CANTSENDMAIL "Eșec în trimiterea unei scrisori." - IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sigur veți continua?" + IDS_CANTPASTE "Nu s-a putut lipi din clipboard. Formatul de date este fie incorect, fie nesuportat." + IDS_SAVEERROR "Nu s-a putut salva imaginea bitmap („hartă de biți”) în fișierul:\n\n%s" + IDS_CANTSENDMAIL "Nu s-a putut trimite un e-mail." + IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sunteți sigur că veți continua?" END

1 year, 5 months

[reactos] 01/01: [NETSHELL] Update Romanian (ro-RO) translation (#6246)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44fa14b337b315c22c778… commit 44fa14b337b315c22c77854f6e02b35355500815 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:19:00 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:19:00 2024 +0100 [NETSHELL] Update Romanian (ro-RO) translation (#6246) --- dll/shellext/netshell/lang/ro-RO.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/netshell/lang/ro-RO.rc b/dll/shellext/netshell/lang/ro-RO.rc index 47d2736b7c8..ae5c7dbe319 100644 --- a/dll/shellext/netshell/lang/ro-RO.rc +++ b/dll/shellext/netshell/lang/ro-RO.rc @@ -94,7 +94,7 @@ BEGIN LTEXT "Alegeți o setare tipică sau una particularizată:", IDC_STATIC, 53, 7, 240, 20 AUTORADIOBUTTON "Setări tipice", IDC_NETWORK_TYPICAL, 53, 27, 253, 18, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Setări particularizate", IDC_NETWORK_CUSTOM, 53, 72, 253, 18, WS_TABSTOP - LTEXT "Crează conexiuni de rețea utilizând Clientela de rețele ReactOS, Partajarea de fișiere și imprimante pentru rețele ReactOS, și (protocolul) TCP/IP pentru adresare automată.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Crează conexiuni de rețea utilizând Clientul de rețele ReactOS, Partajarea de fișiere și imprimante pentru rețele ReactOS, și (protocolul) TCP/IP pentru adresare automată.", IDC_STATIC, 65, 45, 240, 30 LTEXT "Permite configurarea manuală a componentelor de rețea.", IDC_STATIC, 65, 90, 243, 20 END @@ -177,9 +177,9 @@ BEGIN IDS_NETWORKSETTINGSTITLE "Setări de rețea" IDS_NETWORKSETTINGSSUBTITLE "Instalează software-ul de rețea folosit pentru conectarea la alte rețele, calculatoare și Internet." IDS_NETWORKCOMPONENTTITLE "Componente de rețea" - IDS_NETWORKCOMPONENTSUBTITLE "Determinare componente de rețea necesare calculatorului. Pentru adăugare de noi componente, apăsați „Instalare”." + IDS_NETWORKCOMPONENTSUBTITLE "Determină ce componente de rețea sunt folosite la calculatorul dvs. Pentru adăugare de noi componente, apăsați „Instalare”." IDS_NETWORKDOMAINTITLE "Grup de lucru sau domeniu de calculator" - IDS_NETWORKDOMAINSUBTITLE "Un domeniu sau un grup de calculatoare definit de administratorul de rețea. Un grup de lucru este un grup de calculatoare având același nume de grup." + IDS_NETWORKDOMAINSUBTITLE "Specifică felul în care va fi folosit calculatorul - ca parte a unui grup de lucru sau ca parte a unui domeniu de rețea." IDS_REACTOS_SETUP "Expert de instalare ReactOS" IDS_WZD_DOMAIN_NAME "Expertul nu poate continua până\nnu veți introduce un nume de domeniu\nsau grup de lucru." END

1 year, 5 months

[reactos] 01/01: [REGEDIT] Update Romanian (ro-RO) translation (#6223)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c5204b9b2db4ca959208… commit 7c5204b9b2db4ca9592081e0d2e63f91901c9ec8 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:18:17 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:18:17 2024 +0100 [REGEDIT] Update Romanian (ro-RO) translation (#6223) --- base/applications/regedit/lang/ro-RO.rc | 80 ++++++++++++++++----------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index a712b297ba8..5ed6613fd68 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -305,12 +305,12 @@ BEGIN LTEXT "Date specifice dispozitivului:", IDC_STATIC, 10, 177, 180, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "Utilizare", IDC_STATIC, 10, 219, 143, 39 + GROUPBOX "Dispoziție de partajare", IDC_STATIC, 10, 219, 143, 39 LTEXT "Nedeterminată", IDC_UNDETERMINED, 18, 230, 50, 8, WS_DISABLED LTEXT "Partajată", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "Dispozitiv, exclusivă", IDC_DEVICE_EXCLUSIVE, 75, 230, 74, 8, WS_DISABLED LTEXT "Driver, exclusivă", IDC_DRIVER_EXCLUSIVE, 75, 240, 74, 8, WS_DISABLED - RTEXT "Tip interfață:", IDC_STATIC, 158, 220, 57, 8 + RTEXT "Tipul interfeței:", IDC_STATIC, 158, 220, 57, 8 LTEXT "", IDC_INTERFACETYPE, 218, 220, 66, 8 RTEXT "Număr magistrală:", IDC_STATIC, 155, 230, 60, 8 LTEXT "", IDC_BUSNUMBER, 218, 230, 66, 8 @@ -324,19 +324,19 @@ END IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Requirements List" +CAPTION "Listă de cerințe" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66 - RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8 + RTEXT "Tipul interfeței:", IDC_STATIC, 10, 80, 62, 8 LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8 - RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8 + RTEXT "Numărul magistralei:", IDC_STATIC, 10, 90, 62, 8 LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8 - RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8 + RTEXT "Tipul slotului:", IDC_STATIC, 10, 100, 62, 8 LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8 DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14 - PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED + PUSHBUTTON "Arată...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED END IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135 @@ -344,63 +344,63 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | CAPTION "Port" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Tip:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Lungime:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Aliniere:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Adresă minimă:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Adresă maximă:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Dispoziție de partajare:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Opțiuni", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Alternativ", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED + LTEXT "Preferat", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Memory" +CAPTION "Memorie" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Acces:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Lungime:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Aliniere:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Adresă minimă:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Adresă maximă:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Dispoziție de partajare:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Opțiuni", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Alternativ", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED + LTEXT "Preferat", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Interrupt" +CAPTION "Întrerupere" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Tip:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8 - RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Vectorul minim:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8 - RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Vectorul maxim:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Dispoziție de partajare:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Opțiuni", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Alternativ", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED + LTEXT "Preferat", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END @@ -409,15 +409,15 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | CAPTION "DMA" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Canalul minim:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8 - RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Canalul maxim:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Dispoziție de partajare:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Opțiuni", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Alternativ", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED + LTEXT "Preferat", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END

1 year, 5 months

[reactos] 01/01: [MSCTFIME][MSUTB][SDK] Add cicInitUIFLib and cicDoneUIFLib (#6307)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf92fa2386e6e271c6cbc… commit bf92fa2386e6e271c6cbcbe07de64007e571e35f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 6 19:21:37 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 19:21:37 2024 +0900 [MSCTFIME][MSUTB][SDK] Add cicInitUIFLib and cicDoneUIFLib (#6307) Supporting TIPs... JIRA issue: CORE-19360 - Implement cicInitUIFLib and cicDoneUIFLib functions. - Use them in msctfime and msutb. - Add CUIFSystemInfo class in <cicero/cicuif.h>. --- dll/ime/msctfime/msctfime.cpp | 16 +------ dll/win32/msutb/msutb.cpp | 20 +------- dll/win32/msutb/precomp.h | 2 +- sdk/include/reactos/cicero/cicuif.h | 96 +++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 33 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 884b01a500b..c1353076be1 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -3646,18 +3646,6 @@ VOID DetachIME(VOID) UnregisterImeClass(); } -/// @unimplemented -VOID InitUIFLib(VOID) -{ - //FIXME -} - -/// @unimplemented -VOID DoneUIFLib(VOID) -{ - //FIXME -} - /// @implemented BOOL ProcessAttach(HINSTANCE hinstDLL) { @@ -3670,7 +3658,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) cicGetOSInfo(&g_uACP, &g_dwOSInfo); - InitUIFLib(); + cicInitUIFLib(); if (!TFInitLib()) return FALSE; @@ -3695,7 +3683,7 @@ VOID ProcessDetach(HINSTANCE hinstDLL) DeleteCriticalSection(&g_csLock); TLS::InternalDestroyTLS(); TLS::Uninitialize(); - DoneUIFLib(); + cicDoneUIFLib(); } /// @implemented diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 29ecbe7d330..4ba8f878913 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -121,22 +121,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return gModule.DllGetClassObject(rclsid, riid, ppv); } -/** - * @unimplemented - */ -VOID InitUIFLib(VOID) -{ - //FIXME -} - -/** - * @unimplemented - */ -VOID DoneUIFLib(VOID) -{ - //FIXME -} - /** * @implemented */ @@ -167,7 +151,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) cicGetOSInfo(&g_uACP, &g_dwOSInfo); TFInitLib(MsUtbCoCreateInstance); - InitUIFLib(); + cicInitUIFLib(); //CTrayIconWnd::RegisterClassW(); //FIXME @@ -184,7 +168,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) */ VOID ProcessDetach(HINSTANCE hinstDLL) { - DoneUIFLib(); + cicDoneUIFLib(); TFUninitLib(); ::DeleteCriticalSection(&g_cs); gModule.Term(); diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 0a77ed7f3ef..d4579a7511b 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -24,7 +24,7 @@ #include <atlcom.h> #include <strsafe.h> #undef STATUS_NO_MEMORY -#include <cicero/cicbase.h> +#include <cicero/cicuif.h> #include <wine/debug.h> diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 9745484075d..6bc52280640 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -9,6 +9,7 @@ #include "cicarray.h" +class CUIFSystemInfo; struct CUIFTheme; class CUIFObject; class CUIFWindow; @@ -21,6 +22,27 @@ class CUIFScheme; ///////////////////////////////////////////////////////////////////////////// +class CUIFSystemInfo : OSVERSIONINFO +{ +public: + static CUIFSystemInfo *s_pSystemInfo; + DWORD m_cBitsPixels; + BOOL m_bHighContrast1; + BOOL m_bHighContrast2; + + CUIFSystemInfo(); + void GetSystemMetrics(); + void Initialize(); +}; + +DECLSPEC_SELECTANY CUIFSystemInfo *CUIFSystemInfo::s_pSystemInfo = NULL; + +void cicInitUIFSys(void); +void cicDoneUIFSys(void); +void cicUpdateUIFSys(void); + +///////////////////////////////////////////////////////////////////////////// + #include <uxtheme.h> // uxtheme.dll @@ -340,6 +362,80 @@ class CUIFWindow : public CUIFObject ///////////////////////////////////////////////////////////////////////////// +inline void cicInitUIFLib(void) +{ + cicInitUIFSys(); + cicInitUIFScheme(); + cicInitUIFUtil(); +} + +inline void cicDoneUIFLib(void) +{ + cicDoneUIFScheme(); + cicDoneUIFSys(); + cicDoneUIFUtil(); +} + +///////////////////////////////////////////////////////////////////////////// + +inline CUIFSystemInfo::CUIFSystemInfo() +{ + dwMajorVersion = 4; + dwMinorVersion = 0; + dwBuildNumber = 0; + dwPlatformId = VER_PLATFORM_WIN32_WINDOWS; + m_cBitsPixels = 8; + m_bHighContrast1 = m_bHighContrast2 = FALSE; +} + +inline void CUIFSystemInfo::GetSystemMetrics() +{ + HDC hDC = ::GetDC(NULL); + m_cBitsPixels = ::GetDeviceCaps(hDC, BITSPIXEL); + ::ReleaseDC(NULL, hDC); + + HIGHCONTRAST HighContrast = { sizeof(HighContrast) }; + ::SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(HighContrast), &HighContrast, 0); + m_bHighContrast1 = !!(HighContrast.dwFlags & HCF_HIGHCONTRASTON); + COLORREF rgbBtnText = ::GetSysColor(COLOR_BTNTEXT); + COLORREF rgbBtnFace = ::GetSysColor(COLOR_BTNFACE); + const COLORREF black = RGB(0, 0, 0), white = RGB(255, 255, 255); + m_bHighContrast2 = (m_bHighContrast1 || + (rgbBtnText == black && rgbBtnFace == white) || + (rgbBtnText == white && rgbBtnFace == black)); +} + +inline void CUIFSystemInfo::Initialize() +{ + dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + ::GetVersionEx(this); + GetSystemMetrics(); +} + +inline void cicInitUIFSys(void) +{ + CUIFSystemInfo::s_pSystemInfo = new(cicNoThrow) CUIFSystemInfo(); + if (CUIFSystemInfo::s_pSystemInfo) + CUIFSystemInfo::s_pSystemInfo->Initialize(); +} + +inline void cicDoneUIFSys(void) +{ + if (CUIFSystemInfo::s_pSystemInfo) + { + delete CUIFSystemInfo::s_pSystemInfo; + CUIFSystemInfo::s_pSystemInfo = NULL; + } +} + +inline void cicUpdateUIFSys(void) +{ + if (CUIFSystemInfo::s_pSystemInfo) + CUIFSystemInfo::s_pSystemInfo->GetSystemMetrics(); +} + +///////////////////////////////////////////////////////////////////////////// + inline HRESULT CUIFTheme::InternalOpenThemeData(HWND hWnd) { if (!hWnd || !m_pszClassList)

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFBitmapDC (#6306)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb132a90b24811dc9631… commit afb132a90b24811dc9631cf1149b87c302186eb6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 6 17:44:57 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 17:44:57 2024 +0900 [SDK] cicuif.h: Add CUIFBitmapDC (#6306) Supporting TIPs... JIRA issue: CORE-19360 - Add CUIFBitmapDC class. - Add cicInitUIFUtil and cicDoneUIFUtil functions. - Add cicSetLayout, cicMirrorBitmap, cicCreateDitherBrush, cicCreateDisabledBitmap, and cicCreateShadowMaskBmp utility functions. --- sdk/include/reactos/cicero/cicuif.h | 331 +++++++++++++++++++++++++++++++++--- 1 file changed, 309 insertions(+), 22 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 5bbc133f4ef..9745484075d 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -13,6 +13,10 @@ struct CUIFTheme; class CUIFObject; class CUIFWindow; class CUIFObjectArray; +class CUIFColorTable; + class CUIFColorTableSys; + class CUIFColorTableOff10; +class CUIFBitmapDC; class CUIFScheme; ///////////////////////////////////////////////////////////////////////////// @@ -84,6 +88,25 @@ struct CUIFTheme STDMETHOD_(void, SetActiveTheme)(LPCWSTR pszClassList, INT iPartId, DWORD dwUnknown2); }; +// static members +DECLSPEC_SELECTANY HINSTANCE CUIFTheme::s_hUXTHEME = NULL; +DECLSPEC_SELECTANY FN_OpenThemeData CUIFTheme::s_fnOpenThemeData = NULL; +DECLSPEC_SELECTANY FN_CloseThemeData CUIFTheme::s_fnCloseThemeData = NULL; +DECLSPEC_SELECTANY FN_DrawThemeBackground CUIFTheme::s_fnDrawThemeBackground = NULL; +DECLSPEC_SELECTANY FN_DrawThemeParentBackground CUIFTheme::s_fnDrawThemeParentBackground = NULL; +DECLSPEC_SELECTANY FN_DrawThemeText CUIFTheme::s_fnDrawThemeText = NULL; +DECLSPEC_SELECTANY FN_DrawThemeIcon CUIFTheme::s_fnDrawThemeIcon = NULL; +DECLSPEC_SELECTANY FN_GetThemeBackgroundExtent CUIFTheme::s_fnGetThemeBackgroundExtent = NULL; +DECLSPEC_SELECTANY FN_GetThemeBackgroundContentRect CUIFTheme::s_fnGetThemeBackgroundContentRect = NULL; +DECLSPEC_SELECTANY FN_GetThemeTextExtent CUIFTheme::s_fnGetThemeTextExtent = NULL; +DECLSPEC_SELECTANY FN_GetThemePartSize CUIFTheme::s_fnGetThemePartSize = NULL; +DECLSPEC_SELECTANY FN_DrawThemeEdge CUIFTheme::s_fnDrawThemeEdge = NULL; +DECLSPEC_SELECTANY FN_GetThemeColor CUIFTheme::s_fnGetThemeColor = NULL; +DECLSPEC_SELECTANY FN_GetThemeMargins CUIFTheme::s_fnGetThemeMargins = NULL; +DECLSPEC_SELECTANY FN_GetThemeFont CUIFTheme::s_fnGetThemeFont = NULL; +DECLSPEC_SELECTANY FN_GetThemeSysColor CUIFTheme::s_fnGetThemeSysColor = NULL; +DECLSPEC_SELECTANY FN_GetThemeSysSize CUIFTheme::s_fnGetThemeSysSize = NULL; + ///////////////////////////////////////////////////////////////////////////// class CUIFObjectArray : public CicArray<CUIFObject*> @@ -245,6 +268,55 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFBitmapDC +{ +protected: + HBITMAP m_hBitmap; + HGDIOBJ m_hOldBitmap; + HGDIOBJ m_hOldObject; + HDC m_hDC; + +public: + static BOOL s_fInitBitmapDCs; + static CUIFBitmapDC *s_phdcSrc; + static CUIFBitmapDC *s_phdcMask; + static CUIFBitmapDC *s_phdcDst; + + CUIFBitmapDC(BOOL bMemory); + ~CUIFBitmapDC(); + operator HDC() const { return m_hDC; } + + void Uninit(BOOL bKeep); + + BOOL SetBitmap(HBITMAP hBitmap); + BOOL SetBitmap(LONG cx, LONG cy, WORD cPlanes, WORD cBitCount); + BOOL SetDIB(LONG cx, LONG cy, WORD cPlanes, WORD cBitCount); + + HBITMAP DetachBitmap() + { + HBITMAP hOldBitmap = m_hBitmap; + m_hBitmap = NULL; + return hOldBitmap; + } +}; + +DECLSPEC_SELECTANY BOOL CUIFBitmapDC::s_fInitBitmapDCs = FALSE; +DECLSPEC_SELECTANY CUIFBitmapDC *CUIFBitmapDC::s_phdcSrc = NULL; +DECLSPEC_SELECTANY CUIFBitmapDC *CUIFBitmapDC::s_phdcMask = NULL; +DECLSPEC_SELECTANY CUIFBitmapDC *CUIFBitmapDC::s_phdcDst = NULL; + +void cicInitUIFUtil(void); +void cicDoneUIFUtil(void); + +BOOL cicSetLayout(HDC hDC, BOOL bLayout); +HBITMAP cicMirrorBitmap(HBITMAP hBitmap, HBRUSH hbrBack); +HBRUSH cicCreateDitherBrush(VOID); +HBITMAP cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, + BOOL bPressed); +HBITMAP cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRUSH hbr2); + +///////////////////////////////////////////////////////////////////////////// + class CUIFScheme { public: @@ -268,27 +340,6 @@ class CUIFWindow : public CUIFObject ///////////////////////////////////////////////////////////////////////////// -// static members -DECLSPEC_SELECTANY HINSTANCE CUIFTheme::s_hUXTHEME = NULL; -DECLSPEC_SELECTANY FN_OpenThemeData CUIFTheme::s_fnOpenThemeData = NULL; -DECLSPEC_SELECTANY FN_CloseThemeData CUIFTheme::s_fnCloseThemeData = NULL; -DECLSPEC_SELECTANY FN_DrawThemeBackground CUIFTheme::s_fnDrawThemeBackground = NULL; -DECLSPEC_SELECTANY FN_DrawThemeParentBackground CUIFTheme::s_fnDrawThemeParentBackground = NULL; -DECLSPEC_SELECTANY FN_DrawThemeText CUIFTheme::s_fnDrawThemeText = NULL; -DECLSPEC_SELECTANY FN_DrawThemeIcon CUIFTheme::s_fnDrawThemeIcon = NULL; -DECLSPEC_SELECTANY FN_GetThemeBackgroundExtent CUIFTheme::s_fnGetThemeBackgroundExtent = NULL; -DECLSPEC_SELECTANY FN_GetThemeBackgroundContentRect CUIFTheme::s_fnGetThemeBackgroundContentRect = NULL; -DECLSPEC_SELECTANY FN_GetThemeTextExtent CUIFTheme::s_fnGetThemeTextExtent = NULL; -DECLSPEC_SELECTANY FN_GetThemePartSize CUIFTheme::s_fnGetThemePartSize = NULL; -DECLSPEC_SELECTANY FN_DrawThemeEdge CUIFTheme::s_fnDrawThemeEdge = NULL; -DECLSPEC_SELECTANY FN_GetThemeColor CUIFTheme::s_fnGetThemeColor = NULL; -DECLSPEC_SELECTANY FN_GetThemeMargins CUIFTheme::s_fnGetThemeMargins = NULL; -DECLSPEC_SELECTANY FN_GetThemeFont CUIFTheme::s_fnGetThemeFont = NULL; -DECLSPEC_SELECTANY FN_GetThemeSysColor CUIFTheme::s_fnGetThemeSysColor = NULL; -DECLSPEC_SELECTANY FN_GetThemeSysSize CUIFTheme::s_fnGetThemeSysSize = NULL; - -///////////////////////////////////////////////////////////////////////////// - inline HRESULT CUIFTheme::InternalOpenThemeData(HWND hWnd) { if (!hWnd || !m_pszClassList) @@ -526,7 +577,7 @@ inline STDMETHODIMP_(void) CUIFObject::OnUnknown(DWORD x1, DWORD x2, DWORD x3) inline STDMETHODIMP_(void) CUIFObject::GetRect(LPRECT prc) { - *prc = this->m_rc; + *prc = m_rc; } /// @unimplemented @@ -840,3 +891,239 @@ inline void cicDoneUIFScheme(void) CUIFScheme::s_pColorTableOff10 = NULL; } } + +///////////////////////////////////////////////////////////////////////////// + +inline CUIFBitmapDC::CUIFBitmapDC(BOOL bMemory) +{ + m_hBitmap = NULL; + m_hOldBitmap = NULL; + m_hOldObject = NULL; + if (bMemory) + m_hDC = ::CreateCompatibleDC(NULL); + else + m_hDC = ::CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL); +} + +inline CUIFBitmapDC::~CUIFBitmapDC() +{ + Uninit(FALSE); + ::DeleteDC(m_hDC); +} + +inline void CUIFBitmapDC::Uninit(BOOL bKeep) +{ + if (m_hOldBitmap) + { + ::SelectObject(m_hDC, m_hOldBitmap); + m_hOldBitmap = NULL; + } + if (m_hOldObject) + { + ::SelectObject(m_hDC, m_hOldObject); + m_hOldObject = NULL; + } + if (!bKeep) + { + if (m_hBitmap) + { + ::DeleteObject(m_hBitmap); + m_hBitmap = NULL; + } + } +} + +inline BOOL CUIFBitmapDC::SetBitmap(HBITMAP hBitmap) +{ + if (m_hDC) + m_hOldBitmap = ::SelectObject(m_hDC, hBitmap); + return TRUE; +} + +inline BOOL CUIFBitmapDC::SetBitmap(LONG cx, LONG cy, WORD cPlanes, WORD cBitCount) +{ + m_hBitmap = ::CreateBitmap(cx, cy, cPlanes, cBitCount, 0); + m_hOldBitmap = ::SelectObject(m_hDC, m_hBitmap); + return TRUE; +} + +inline BOOL CUIFBitmapDC::SetDIB(LONG cx, LONG cy, WORD cPlanes, WORD cBitCount) +{ + BITMAPINFO bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = cx; + bmi.bmiHeader.biHeight = cy; + bmi.bmiHeader.biPlanes = cPlanes; + bmi.bmiHeader.biBitCount = cBitCount; + bmi.bmiHeader.biCompression = BI_RGB; + m_hBitmap = ::CreateDIBSection(m_hDC, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); + m_hOldBitmap = ::SelectObject(m_hDC, m_hBitmap); + return TRUE; +} + +inline void cicInitUIFUtil(void) +{ + if (!CUIFBitmapDC::s_phdcSrc) + CUIFBitmapDC::s_phdcSrc = new(cicNoThrow) CUIFBitmapDC(TRUE); + + if (!CUIFBitmapDC::s_phdcMask) + CUIFBitmapDC::s_phdcMask = new(cicNoThrow) CUIFBitmapDC(TRUE); + + if (!CUIFBitmapDC::s_phdcDst) + CUIFBitmapDC::s_phdcDst = new(cicNoThrow) CUIFBitmapDC(TRUE); + + if (CUIFBitmapDC::s_phdcSrc && CUIFBitmapDC::s_phdcMask && CUIFBitmapDC::s_phdcDst) + CUIFBitmapDC::s_fInitBitmapDCs = TRUE; +} + +inline void cicDoneUIFUtil(void) +{ + if (CUIFBitmapDC::s_phdcSrc) + { + delete CUIFBitmapDC::s_phdcSrc; + CUIFBitmapDC::s_phdcSrc = NULL; + } + if (CUIFBitmapDC::s_phdcMask) + { + delete CUIFBitmapDC::s_phdcMask; + CUIFBitmapDC::s_phdcMask = NULL; + } + if (CUIFBitmapDC::s_phdcDst) + { + delete CUIFBitmapDC::s_phdcDst; + CUIFBitmapDC::s_phdcDst = NULL; + } + + CUIFBitmapDC::s_fInitBitmapDCs = FALSE; +} + +inline BOOL cicSetLayout(HDC hDC, DWORD dwLayout) +{ + typedef BOOL (WINAPI *FN_SetLayout)(HDC hDC, DWORD dwLayout); + static HINSTANCE s_hGdi32 = NULL; + static FN_SetLayout s_fnSetLayout = NULL; + + if (!cicGetFN(s_hGdi32, s_fnSetLayout, TEXT("gdi32.dll"), "SetLayout")) + return FALSE; + + return s_fnSetLayout(hDC, dwLayout); +} + +inline HBITMAP cicMirrorBitmap(HBITMAP hBitmap, HBRUSH hbrBack) +{ + BITMAP bm; + if (!CUIFBitmapDC::s_fInitBitmapDCs || !::GetObject(hBitmap, sizeof(bm), &bm)) + return NULL; + + CUIFBitmapDC::s_phdcSrc->SetBitmap(hBitmap); + CUIFBitmapDC::s_phdcDst->SetDIB(bm.bmWidth, bm.bmHeight, 1, 32); + CUIFBitmapDC::s_phdcMask->SetDIB(bm.bmWidth, bm.bmHeight, 1, 32); + + RECT rc; + ::SetRect(&rc, 0, 0, bm.bmWidth, bm.bmHeight); + FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbrBack); + + cicSetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_RTL); + + ::BitBlt(*CUIFBitmapDC::s_phdcMask, 0, 0, bm.bmWidth, bm.bmHeight, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCCOPY); + + cicSetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_LTR); + + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, bm.bmWidth, bm.bmHeight, *CUIFBitmapDC::s_phdcMask, 1, 0, SRCCOPY); + + CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); + CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcDst->Uninit(TRUE); + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +} + +inline HBRUSH cicCreateDitherBrush(VOID) +{ + BYTE Bits[16]; + ZeroMemory(&Bits, sizeof(Bits)); + Bits[0] = Bits[4] = Bits[8] = Bits[12] = 'U'; + Bits[2] = Bits[6] = Bits[10] = Bits[14] = 0xAA; + HBITMAP hBitmap = ::CreateBitmap(8, 8, 1, 1, Bits); + if (!hBitmap) + return NULL; + + LOGBRUSH lb; + lb.lbHatch = (ULONG_PTR)hBitmap; + lb.lbStyle = BS_PATTERN; + HBRUSH hbr = ::CreateBrushIndirect(&lb); + ::DeleteObject(hBitmap); + return hbr; +} + +inline HBITMAP +cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, BOOL bPressed) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + LONG width = prc->right - prc->left, height = prc->bottom - prc->top; + + CUIFBitmapDC::s_phdcDst->SetDIB(width, height, 1, 32); + CUIFBitmapDC::s_phdcMask->SetBitmap(hbmMask); + CUIFBitmapDC::s_phdcSrc->SetDIB(width, height, 1, 32); + + RECT rc; + ::SetRect(&rc, 0, 0, width, height); + ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbr1); + + HBRUSH hbrWhite = (HBRUSH)GetStockObject(WHITE_BRUSH); + ::FillRect(*CUIFBitmapDC::s_phdcSrc, &rc, hbrWhite); + + ::BitBlt(*CUIFBitmapDC::s_phdcSrc, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCINVERT); + if (bPressed) + BitBlt(*CUIFBitmapDC::s_phdcDst, 1, 1, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); + else + BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); + + ::FillRect(*CUIFBitmapDC::s_phdcSrc, &rc, hbr2); + + ::BitBlt(*CUIFBitmapDC::s_phdcSrc, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCPAINT); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCAND); + + CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); + CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcDst->Uninit(TRUE); + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +} + +inline HBITMAP +cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRUSH hbr2) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + --prc->left; + --prc->top; + + LONG width = prc->right - prc->left; + LONG height = prc->bottom - prc->top; + + CUIFBitmapDC bitmapDC(TRUE); + + CUIFBitmapDC::s_phdcDst->SetDIB(width, height, 1, 32); + CUIFBitmapDC::s_phdcSrc->SetBitmap(hbm1); + CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); + bitmapDC.SetDIB(width, height, 1, 32); + + RECT rc; + ::SetRect(&rc, 0, 0, width, height); + + ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbr1); + ::FillRect(bitmapDC, &rc, hbr2); + + ::BitBlt(bitmapDC, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCPAINT); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 2, 2, width, height, bitmapDC, 0, 0, SRCAND); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCAND); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCINVERT); + + CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); + CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcDst->Uninit(TRUE); + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +}

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFColorTable (#6305)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46cf45414cfa4f23828f1… commit 46cf45414cfa4f23828f1b4d1ad60b5545d42207 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 6 14:45:23 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 14:45:23 2024 +0900 [SDK] cicuif.h: Add CUIFColorTable (#6305) Supporting TIPs... JIRA issue: CORE-19360 - Improve cicGetFN function. - Add CUIFColorTable, CUIFColorTableSys, and CUIFColorTableOff10 classes. - Implement cicInitUIFScheme, cicUpdateUIFScheme, and cicDoneUIFScheme functions. --- sdk/include/reactos/cicero/cicbase.h | 28 ++-- sdk/include/reactos/cicero/cicuif.h | 287 ++++++++++++++++++++++++++++------- 2 files changed, 245 insertions(+), 70 deletions(-) diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index a85be273a99..25c3710ec77 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -62,20 +62,6 @@ inline void operator delete[](void* ptr, size_t size) noexcept cicMemFree(ptr); } -template <typename T_FN> -static inline BOOL -cicGetFN(HINSTANCE& hinstDLL, T_FN& fn, LPCTSTR pszDllName, LPCSTR pszFuncName) -{ - if (fn) - return TRUE; - if (!hinstDLL) - hinstDLL = LoadLibrary(pszDllName); - if (!hinstDLL) - return FALSE; - fn = reinterpret_cast<T_FN>(GetProcAddress(hinstDLL, pszFuncName)); - return !!fn; -} - typedef struct CIC_LIBTHREAD { IUnknown *m_pUnknown1; @@ -176,6 +162,20 @@ cicLoadSystemLibrary( return ::LoadLibrary(ModPath.m_szPath); } +template <typename T_FN> +static inline BOOL +cicGetFN(HINSTANCE& hinstDLL, T_FN& fn, LPCTSTR pszDllName, LPCSTR pszFuncName) +{ + if (fn) + return TRUE; + if (!hinstDLL) + hinstDLL = cicLoadSystemLibrary(pszDllName, FALSE); + if (!hinstDLL) + return FALSE; + fn = reinterpret_cast<T_FN>(GetProcAddress(hinstDLL, pszFuncName)); + return !!fn; +} + #include <ndk/pstypes.h> /* for PROCESSINFOCLASS */ /* ntdll!NtQueryInformationProcess */ diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index bdbc451ddab..5bbc133f4ef 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -154,16 +154,16 @@ public: STDMETHOD_(void, Initialize)(); STDMETHOD_(void, OnPaint)(HWND hWnd); - STDMETHOD_(void, OnHideToolTip)(); - STDMETHOD_(void, OnLButtonDown)(POINT pt); - STDMETHOD_(void, OnLButtonDblClk)(POINT pt); - STDMETHOD_(void, OnLButtonUp)(POINT pt); - STDMETHOD_(void, OnMButtonDown)(POINT pt); - STDMETHOD_(void, OnMButtonDblClk)(POINT pt); - STDMETHOD_(void, OnMButtonUp)(POINT pt); - STDMETHOD_(void, OnRButtonDown)(POINT pt); - STDMETHOD_(void, OnRButtonDblClk)(POINT pt); - STDMETHOD_(void, OnRButtonUp)(POINT pt); + STDMETHOD_(void, OnHideToolTip)() { } // FIXME: name + STDMETHOD_(void, OnLButtonDown)(POINT pt) { } + STDMETHOD_(void, OnMButtonDown)(POINT pt) { } + STDMETHOD_(void, OnRButtonDown)(POINT pt) { } + STDMETHOD_(void, OnLButtonUp)(POINT pt) { } + STDMETHOD_(void, OnMButtonUp)(POINT pt) { } + STDMETHOD_(void, OnRButtonUp)(POINT pt) { } + STDMETHOD_(void, OnMouseMove)(POINT pt) { } + STDMETHOD_(void, OnRButtonDblClk)(POINT pt) { } //FIXME: name + STDMETHOD_(void, OnRButtonUp2)(POINT pt) { } //FIXME: name STDMETHOD_(void, OnUnknown)(DWORD x1, DWORD x2, DWORD x3); //FIXME: name and type STDMETHOD_(void, GetRect)(LPRECT prc); STDMETHOD_(void, SetRect)(LPCRECT prc); @@ -181,7 +181,7 @@ public: STDMETHOD_(void, SetToolTip)(LPCWSTR pszToolTip); STDMETHOD_(LPCWSTR, GetToolTip)(); STDMETHOD_(LRESULT, OnShowToolTip)(); - STDMETHOD_(void, OnHideToolTip2)(); + STDMETHOD_(void, OnHideToolTip2)() { } // FIXME: name STDMETHOD_(void, DetachWndObj)(); STDMETHOD_(void, ClearWndObj)(); STDMETHOD_(LRESULT, OnPaintTheme)(HWND hWnd); @@ -191,6 +191,76 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFColorTable +{ +public: + CUIFColorTable() { } + virtual ~CUIFColorTable() { } + + STDMETHOD_(void, InitColor)() = 0; + STDMETHOD_(void, DoneColor)() { } + STDMETHOD_(void, InitBrush)() = 0; + STDMETHOD_(void, DoneBrush)() = 0; + + void Update() + { + DoneColor(); + DoneBrush(); + InitColor(); + InitBrush(); + } +}; + +class CUIFColorTableSys : public CUIFColorTable +{ +protected: + COLORREF m_rgbColors[16]; + HBRUSH m_hBrushes[16]; + +public: + CUIFColorTableSys() { } + + HBRUSH GetBrush(INT iColor); + + STDMETHOD_(void, InitColor)() override; + STDMETHOD_(void, InitBrush)() override; + STDMETHOD_(void, DoneBrush)() override; +}; + +class CUIFColorTableOff10 : public CUIFColorTable +{ +protected: + COLORREF m_rgbColors[32]; + HBRUSH m_hBrushes[32]; + +public: + CUIFColorTableOff10() { } + + HBRUSH GetBrush(INT iColor); + + STDMETHOD_(void, InitColor)() override; + STDMETHOD_(void, InitBrush)() override; + STDMETHOD_(void, DoneBrush)() override; +}; + +///////////////////////////////////////////////////////////////////////////// + +class CUIFScheme +{ +public: + static CUIFColorTableSys *s_pColorTableSys; + static CUIFColorTableOff10 *s_pColorTableOff10; +}; + +DECLSPEC_SELECTANY CUIFColorTableSys *CUIFScheme::s_pColorTableSys = NULL; +DECLSPEC_SELECTANY CUIFColorTableOff10 *CUIFScheme::s_pColorTableOff10 = NULL; + +void cicInitUIFScheme(void); +void cicUpdateUIFScheme(void); +void cicDoneUIFScheme(void); + +///////////////////////////////////////////////////////////////////////////// + class CUIFWindow : public CUIFObject { //FIXME @@ -450,46 +520,6 @@ inline STDMETHODIMP_(void) CUIFObject::OnPaint(HWND hWnd) OnSetFocus(hWnd); } -inline STDMETHODIMP_(void) CUIFObject::OnHideToolTip() -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnLButtonDown(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnLButtonDblClk(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnLButtonUp(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnMButtonDown(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnMButtonDblClk(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnMButtonUp(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnRButtonDown(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnRButtonDblClk(POINT pt) -{ -} - -inline STDMETHODIMP_(void) CUIFObject::OnRButtonUp(POINT pt) -{ -} - inline STDMETHODIMP_(void) CUIFObject::OnUnknown(DWORD x1, DWORD x2, DWORD x3) { } @@ -631,11 +661,6 @@ inline STDMETHODIMP_(LRESULT) CUIFObject::OnShowToolTip() return 0; } -// FIXME: name -inline STDMETHODIMP_(void) CUIFObject::OnHideToolTip2() -{ -} - /// @unimplemented inline STDMETHODIMP_(void) CUIFObject::DetachWndObj() { @@ -665,3 +690,153 @@ inline STDMETHODIMP_(void) CUIFObject::ClearTheme() for (size_t iItem = 0; iItem < m_ObjectArray.size(); ++iItem) m_ObjectArray[iItem]->ClearTheme(); } + +///////////////////////////////////////////////////////////////////////////// + +inline STDMETHODIMP_(void) CUIFColorTableSys::InitColor() +{ + m_rgbColors[0] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[1] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[2] = GetSysColor(COLOR_ACTIVEBORDER); + m_rgbColors[3] = GetSysColor(COLOR_ACTIVECAPTION); + m_rgbColors[4] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[5] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[6] = GetSysColor(COLOR_BTNTEXT); + m_rgbColors[7] = GetSysColor(COLOR_CAPTIONTEXT); + m_rgbColors[8] = GetSysColor(COLOR_GRAYTEXT); + m_rgbColors[9] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[10] = GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[11] = GetSysColor(COLOR_INACTIVECAPTION); + m_rgbColors[12] = GetSysColor(COLOR_INACTIVECAPTIONTEXT); + m_rgbColors[13] = GetSysColor(COLOR_MENUTEXT); + m_rgbColors[14] = GetSysColor(COLOR_WINDOW); + m_rgbColors[15] = GetSysColor(COLOR_WINDOWTEXT); +} + +inline STDMETHODIMP_(void) CUIFColorTableSys::InitBrush() +{ + ZeroMemory(m_hBrushes, sizeof(m_hBrushes)); +} + +inline STDMETHODIMP_(void) CUIFColorTableSys::DoneBrush() +{ + for (size_t i = 0; i < _countof(m_hBrushes); ++i) + { + if (m_hBrushes[i]) + { + ::DeleteObject(m_hBrushes[i]); + m_hBrushes[i] = NULL; + } + } +} + +inline HBRUSH CUIFColorTableSys::GetBrush(INT iColor) +{ + if (!m_hBrushes[iColor]) + m_hBrushes[iColor] = ::CreateSolidBrush(m_rgbColors[iColor]); + return m_hBrushes[iColor]; +} + +inline HBRUSH CUIFColorTableOff10::GetBrush(INT iColor) +{ + if (!m_hBrushes[iColor]) + m_hBrushes[iColor] = ::CreateSolidBrush(m_rgbColors[iColor]); + return m_hBrushes[iColor]; +} + +/// @unimplemented +inline STDMETHODIMP_(void) CUIFColorTableOff10::InitColor() +{ + m_rgbColors[0] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[1] = GetSysColor(COLOR_WINDOW); + m_rgbColors[2] = GetSysColor(COLOR_WINDOW); + m_rgbColors[3] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[4] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[5] = GetSysColor(COLOR_WINDOW); + m_rgbColors[6] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[7] = GetSysColor(COLOR_WINDOWTEXT); + m_rgbColors[8] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[9] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[10] = GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[11] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[12] = GetSysColor(COLOR_BTNTEXT); + m_rgbColors[13] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[14] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[15] = GetSysColor(COLOR_WINDOW); + m_rgbColors[16] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[17] = GetSysColor(COLOR_BTNTEXT); + m_rgbColors[18] = GetSysColor(COLOR_WINDOW); + m_rgbColors[19] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[20] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[21] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[22] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[23] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[24] = GetSysColor(COLOR_CAPTIONTEXT); + m_rgbColors[25] = GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[26] = GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[27] = GetSysColor(COLOR_BTNFACE); + m_rgbColors[28] = GetSysColor(COLOR_BTNTEXT); + m_rgbColors[29] = GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[30] = GetSysColor(COLOR_BTNTEXT); + m_rgbColors[31] = GetSysColor(COLOR_WINDOWTEXT); +} + +inline STDMETHODIMP_(void) CUIFColorTableOff10::InitBrush() +{ + ZeroMemory(m_hBrushes, sizeof(m_hBrushes)); +} + +inline STDMETHODIMP_(void) CUIFColorTableOff10::DoneBrush() +{ + for (size_t i = 0; i < _countof(m_hBrushes); ++i) + { + if (m_hBrushes[i]) + { + ::DeleteObject(m_hBrushes[i]); + m_hBrushes[i] = NULL; + } + } +} + +///////////////////////////////////////////////////////////////////////////// + +inline void cicInitUIFScheme(void) +{ + CUIFColorTable *pColorTable; + + pColorTable = CUIFScheme::s_pColorTableSys = new(cicNoThrow) CUIFColorTableSys(); + if (pColorTable) + { + pColorTable->InitColor(); + pColorTable->InitBrush(); + } + + pColorTable = CUIFScheme::s_pColorTableOff10 = new(cicNoThrow) CUIFColorTableOff10(); + if (pColorTable) + { + pColorTable->InitColor(); + pColorTable->InitBrush(); + } +} + +inline void cicUpdateUIFScheme(void) +{ + if (CUIFScheme::s_pColorTableSys) + CUIFScheme::s_pColorTableSys->Update(); + if (CUIFScheme::s_pColorTableOff10) + CUIFScheme::s_pColorTableOff10->Update(); +} + +inline void cicDoneUIFScheme(void) +{ + if (CUIFScheme::s_pColorTableSys) + { + delete CUIFScheme::s_pColorTableSys; + CUIFScheme::s_pColorTableSys = NULL; + } + if (CUIFScheme::s_pColorTableOff10) + { + delete CUIFScheme::s_pColorTableOff10; + CUIFScheme::s_pColorTableOff10 = NULL; + } +}

1 year, 5 months

[reactos] 01/01: [SHELL32] Don't crash on Control Panel item D&D (#6289)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d689cfe1582db3e554784… commit d689cfe1582db3e554784cc29917cf3637817c64 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 6 11:00:36 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 11:00:36 2024 +0900 [SHELL32] Don't crash on Control Panel item D&D (#6289) Based on @douglyons 's control-panel-copy-to-desktop-fix.patch. JIRA issue: CORE-19210 - Delete needless #ifdef __REACTOS__ guards because shlfileop.cpp is a forked file. - Do NULL check against feFrom->szFilename. --- dll/win32/shell32/shlfileop.cpp | 64 +++-------------------------------------- 1 file changed, 4 insertions(+), 60 deletions(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index f90f3265773..cc3bc40748c 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -658,7 +658,6 @@ EXTERN_C DWORD WINAPI Win32DeleteFileW(LPCWSTR path) return (SHNotifyDeleteFileW(NULL, path) == ERROR_SUCCESS); } -#ifdef __REACTOS__ /************************************************************************ * CheckForError [internal] * @@ -698,7 +697,6 @@ static DWORD CheckForError(FILE_OPERATION *op, DWORD error, LPCWSTR src) exit: return error; } -#endif /************************************************************************ * SHNotifyMoveFile [internal] @@ -748,11 +746,7 @@ static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO return ERROR_SUCCESS; } -#ifdef __REACTOS__ return CheckForError(op, GetLastError(), src); -#else - return GetLastError(); -#endif } static BOOL SHIsCdRom(LPCWSTR path) @@ -822,11 +816,7 @@ static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO return ERROR_SUCCESS; } -#ifdef __REACTOS__ return CheckForError(op, GetLastError(), src); -#else - return GetLastError(); -#endif } /************************************************************************* @@ -1336,7 +1326,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; FILE_LIST flFromNew, flToNew; - if (IsDotDir(feFrom->szFilename)) + if (feFrom->szFilename && IsDotDir(feFrom->szFilename)) return; if (PathFileExistsW(szDestPath)) @@ -1344,7 +1334,6 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST else lstrcpyW(szTo, szDestPath); -#ifdef __REACTOS__ if (PathFileExistsW(szTo)) { if (op->req->fFlags & FOF_RENAMEONCOLLISION) @@ -1356,16 +1345,6 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST } } else if (!(op->req->fFlags & FOF_NOCONFIRMATION)) -#else - if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) - { - CStringW newPath; - if (lstrcmp(feFrom->szDirectory, szDestPath) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty()) - { - StringCchCopyW(szTo, _countof(szTo), newPath); - } - else -#endif { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) { @@ -1396,7 +1375,6 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) { -#ifdef __REACTOS__ if (PathFileExistsW(szTo)) { if (op->req->fFlags & FOF_RENAMEONCOLLISION) @@ -1412,18 +1390,6 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) return FALSE; } -#else - if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) - { - CStringW newPath; - if (lstrcmp(szFrom, szTo) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty()) - { - return SHNotifyCopyFileW(op, szFrom, newPath, FALSE) == 0; - } - - if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) - return FALSE; -#endif } return SHNotifyCopyFileW(op, szFrom, szTo, FALSE) == 0; @@ -1719,7 +1685,7 @@ static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; FILE_LIST flFromNew, flToNew; - if (IsDotDir(feFrom->szFilename)) + if (feFrom->szFilename && IsDotDir(feFrom->szFilename)) return; SHNotifyCreateDirectoryW(szDestPath, NULL); @@ -1744,7 +1710,6 @@ static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST Win32RemoveDirectoryW(feFrom->szFullPath); } -#ifdef __REACTOS__ static BOOL move_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) { if (PathFileExistsW(szTo)) @@ -1766,26 +1731,19 @@ static BOOL move_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH return SHNotifyMoveFileW(op, szFrom, szTo, FALSE) == 0; } -#endif /* moves a file or directory to another directory */ static void move_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) { WCHAR szDestPath[MAX_PATH]; -#ifdef __REACTOS__ if (!PathFileExistsW(feTo->szFullPath)) SHNotifyCreateDirectoryW(feTo->szFullPath, NULL); -#endif PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); if (IsAttribFile(feFrom->attributes)) -#ifdef __REACTOS__ move_file_to_file(op, feFrom->szFullPath, szDestPath); -#else - SHNotifyMoveFileW(op, feFrom->szFullPath, szDestPath, FALSE); -#endif else if (!(op->req->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) move_dir_to_dir(op, feFrom, szDestPath); } @@ -1846,7 +1804,6 @@ static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flF } } -#ifdef __REACTOS__ if ((flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1) || IsAttribDir(fileDest->attributes)) { @@ -1864,12 +1821,6 @@ static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flF return ERROR_CANCELLED; } } -#else - if (fileDest->bExists && IsAttribDir(fileDest->attributes)) - move_to_dir(op, entryToMove, fileDest); - else - SHNotifyMoveFileW(op, entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); -#endif if (op->progress != NULL) op->bCancelled |= op->progress->HasUserCancelled(); @@ -1921,18 +1872,12 @@ static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS | FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | -#ifdef __REACTOS__ FOF_WANTMAPPINGHANDLE; -#else - FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE; -#endif if (fFlags & wUnsupportedFlags) FIXME("Unsupported flags: %04x\n", fFlags); } -#ifdef __REACTOS__ - static DWORD validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) { @@ -2026,7 +1971,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT return ERROR_SUCCESS; } -#endif + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -2063,11 +2008,10 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) op.completedSize.QuadPart = 0ull; op.bManyItems = (flFrom.dwNumFiles > 1); -#ifdef __REACTOS__ ret = validate_operation(lpFileOp, &flFrom, &flTo); if (ret) goto cleanup; -#endif + if (lpFileOp->wFunc != FO_RENAME && !(lpFileOp->fFlags & FOF_SILENT)) { ret = CoCreateInstance(CLSID_ProgressDialog, NULL,

1 year, 5 months

[reactos] 01/01: [DESK] Find best display settings (#6288)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d7a8f0ec106d5e6780cf… commit 8d7a8f0ec106d5e6780cfd3ae974894027883a0a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 6 10:59:05 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 10:59:05 2024 +0900 [DESK] Find best display settings (#6288) Based on KRosUser's desk.patch. JIRA issue: CORE-18187, CORE-16878 - Add FindBestElement helper function. - Use FindBestElement to find the best display settings. --- dll/cpl/desk/settings.c | 51 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index 602df32800b..aefaa9f6d6b 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -842,6 +842,34 @@ SwitchDisplayMode(HWND hwndDlg, PWSTR DeviceName, PSETTINGS_ENTRY seInit, PSETTI } } +static +PSETTINGS_ENTRY +FindBestElement( + _In_ PDISPLAY_DEVICE_ENTRY pDevice) +{ + PSETTINGS_ENTRY Request = &pDevice->InitialSettings, BestEntry = NULL, Current; + LONG Distance, NearestDistance = MAXLONG; + + /* Find the best entry in the list */ + for (Current = pDevice->Settings; Current; Current = Current->Flink) + { + Distance = 0x100000 * labs(Current->dmBitsPerPel - Request->dmBitsPerPel ) + + 0x100 * labs(Current->dmPelsWidth - Request->dmPelsWidth ) + + 0x100 * labs(Current->dmPelsHeight - Request->dmPelsHeight ) + + labs(Current->dmDisplayFrequency - Request->dmDisplayFrequency); + if (Distance == 0) + return Current; + + if (Distance < NearestDistance) + { + BestEntry = Current; + NearestDistance = Distance; + } + } + + return BestEntry; +} + static VOID ApplyDisplaySettings(HWND hwndDlg, PSETTINGS_DATA pData) { @@ -866,10 +894,7 @@ ApplyDisplaySettings(HWND hwndDlg, PSETTINGS_DATA pData) } else { - pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth = pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth; - pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight = pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight; - pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel = pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel; - pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency = pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency; + pData->CurrentDisplayDevice->CurrentSettings = FindBestElement(pData->CurrentDisplayDevice); UpdateDisplay(hwndDlg, pData, TRUE); } } @@ -921,16 +946,16 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar DEVMODE devmode; ZeroMemory(&devmode, sizeof(devmode)); devmode.dmSize = (WORD)sizeof(devmode); - if (EnumDisplaySettingsExW(pData->CurrentDisplayDevice->DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0)) + if (EnumDisplaySettingsExW(pData->CurrentDisplayDevice->DeviceName, + ENUM_CURRENT_SETTINGS, &devmode, 0)) { - pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = devmode.dmPelsWidth; - pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = devmode.dmPelsHeight; - pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = devmode.dmBitsPerPel; - pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency = devmode.dmDisplayFrequency; - pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth = pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth; - pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight = pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight; - pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel = pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel; - pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency = pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency; + PSETTINGS_ENTRY pInitialSettings = &pData->CurrentDisplayDevice->InitialSettings; + pInitialSettings->dmPelsWidth = devmode.dmPelsWidth; + pInitialSettings->dmPelsHeight = devmode.dmPelsHeight; + pInitialSettings->dmBitsPerPel = devmode.dmBitsPerPel; + pInitialSettings->dmDisplayFrequency = devmode.dmDisplayFrequency; + pData->CurrentDisplayDevice->CurrentSettings = + FindBestElement(pData->CurrentDisplayDevice); UpdateDisplay(hwndDlg, pData, TRUE); } }

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs