Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [README] Update release article link

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a1fd20f3ed05e30add9a… commit 1a1fd20f3ed05e30add9a3d3825544d36fc469c1 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Dec 17 22:35:26 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Dec 17 22:35:26 2021 +0300 [README] Update release article link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b75bb1ae90e..7aca79cd35f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-0413-released/"> + <a href="https://reactos.org/project-news/reactos-0414-released/"> <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg"> </a> <a href="https://reactos.org/download/">

3 years, 5 months

[reactos] 01/01: [README] Update release version

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=011bd77a946c4992e10a0… commit 011bd77a946c4992e10a0d5c65dc5240d82b1713 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Dec 17 22:34:18 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Dec 17 22:34:18 2021 +0300 [README] Update release version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ed73613325..b75bb1ae90e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ <p align=center> <a href="https://reactos.org/project-news/reactos-0413-released/"> - <img alt="ReactOS 0.4.13 Release" src="https://img.shields.io/badge/release-0.4.13-0688CB.svg"> + <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg"> </a> <a href="https://reactos.org/download/"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

3 years, 5 months

[reactos] 01/01: [SCSIPORT] Ignore LUNs not supported by the adapter

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac5536aa48b48d75ab99c… commit ac5536aa48b48d75ab99c9f385d245892f2ed630 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Dec 17 09:01:34 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Dec 17 11:09:23 2021 +0100 [SCSIPORT] Ignore LUNs not supported by the adapter CORE-17641 --- drivers/storage/port/scsiport/fdo.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/storage/port/scsiport/fdo.c b/drivers/storage/port/scsiport/fdo.c index bdb6bf32b38..8972c6f1aea 100644 --- a/drivers/storage/port/scsiport/fdo.c +++ b/drivers/storage/port/scsiport/fdo.c @@ -251,11 +251,17 @@ FdoScanAdapter( /* Scan all logical units */ for (UINT8 lun = 0; lun < PortExtension->MaxLunCount; lun++) { + PSCSI_PORT_LUN_EXTENSION lunExt; + + /* Skip invalid lun values */ + if (lun >= PortExtension->PortConfig->MaximumNumberOfLogicalUnits) + continue; + // try to find an existing device - PSCSI_PORT_LUN_EXTENSION lunExt = GetLunByPath(PortExtension, - pathId, - targetId, - lun); + lunExt = GetLunByPath(PortExtension, + pathId, + targetId, + lun); if (lunExt) {

3 years, 5 months

[reactos] 01/01: [COMDLG32] Fix ico3 not shown in Print dialog (#2831) (#2831)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a36cc8054d266b75ad3bb… commit a36cc8054d266b75ad3bb53cf0a5ab8d72a412c9 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Dec 17 04:06:55 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 17 13:06:55 2021 +0900 [COMDLG32] Fix ico3 not shown in Print dialog (#2831) (#2831) --- dll/win32/comdlg32/lang/cdlg_Bg.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ca.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Cs.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Da.rc | 2 +- dll/win32/comdlg32/lang/cdlg_De.rc | 2 +- dll/win32/comdlg32/lang/cdlg_El.rc | 2 +- dll/win32/comdlg32/lang/cdlg_En.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Eo.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Es.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Et.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Fi.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Fr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_He.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Hi.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Hu.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Id.rc | 2 +- dll/win32/comdlg32/lang/cdlg_It.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ja.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ko.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Lt.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Nl.rc | 2 +- dll/win32/comdlg32/lang/cdlg_No.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Pl.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Pt.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ro.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ru.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Si.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sk.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sq.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sv.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Th.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Tr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Uk.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Zh.rc | 2 +- dll/win32/comdlg32/printdlg.c | 10 ++-------- 36 files changed, 37 insertions(+), 43 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Bg.rc b/dll/win32/comdlg32/lang/cdlg_Bg.rc index 23832088ea4..963a2e46bc0 100644 --- a/dll/win32/comdlg32/lang/cdlg_Bg.rc +++ b/dll/win32/comdlg32/lang/cdlg_Bg.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Копия", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Брой &копия:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Под&реждане", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Ca.rc b/dll/win32/comdlg32/lang/cdlg_Ca.rc index a659733968e..420996140d4 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ca.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ca.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombre de &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ompagina", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Cs.rc b/dll/win32/comdlg32/lang/cdlg_Cs.rc index 2018a548ce1..c2f467d0cb5 100644 --- a/dll/win32/comdlg32/lang/cdlg_Cs.rc +++ b/dll/win32/comdlg32/lang/cdlg_Cs.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Počet &kopií:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "K&ompletovat", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Da.rc b/dll/win32/comdlg32/lang/cdlg_Da.rc index 494498de25e..e99fce29b37 100644 --- a/dll/win32/comdlg32/lang/cdlg_Da.rc +++ b/dll/win32/comdlg32/lang/cdlg_Da.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopier", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Antal &kopier:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&hold sammen", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_De.rc b/dll/win32/comdlg32/lang/cdlg_De.rc index c562d93e027..6bfe181afc4 100644 --- a/dll/win32/comdlg32/lang/cdlg_De.rc +++ b/dll/win32/comdlg32/lang/cdlg_De.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopien", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Anzahl &Kopien:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "S&ortieren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_El.rc b/dll/win32/comdlg32/lang/cdlg_El.rc index 7c5b83fe7d2..04852bc3838 100644 --- a/dll/win32/comdlg32/lang/cdlg_El.rc +++ b/dll/win32/comdlg32/lang/cdlg_El.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Αντίγραφα", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Αριθμός &Αντιγράφων:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_En.rc b/dll/win32/comdlg32/lang/cdlg_En.rc index 35923759f0a..901c227aa0b 100644 --- a/dll/win32/comdlg32/lang/cdlg_En.rc +++ b/dll/win32/comdlg32/lang/cdlg_En.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Number of &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Eo.rc b/dll/win32/comdlg32/lang/cdlg_Eo.rc index 485db726796..8442edae49c 100644 --- a/dll/win32/comdlg32/lang/cdlg_Eo.rc +++ b/dll/win32/comdlg32/lang/cdlg_Eo.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Ekzempleroj", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombro da &ekzempleroj:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Laŭ&kajere", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Es.rc b/dll/win32/comdlg32/lang/cdlg_Es.rc index 9a009e59da8..ed91c2de0ef 100644 --- a/dll/win32/comdlg32/lang/cdlg_Es.rc +++ b/dll/win32/comdlg32/lang/cdlg_Es.rc @@ -375,7 +375,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copias", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Número de &copias:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Intercalar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Et.rc b/dll/win32/comdlg32/lang/cdlg_Et.rc index 5b1f37d5122..e71c847d100 100644 --- a/dll/win32/comdlg32/lang/cdlg_Et.rc +++ b/dll/win32/comdlg32/lang/cdlg_Et.rc @@ -370,7 +370,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Koopiad", grp2, 160, 92, 120,64, WS_GROUP LTEXT "&Koopiate arv:", stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "V&õrdle", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Fi.rc b/dll/win32/comdlg32/lang/cdlg_Fi.rc index 2c97729c5b1..3868df94723 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fi.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopioita", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Kopioiden &määrä:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Kokoa", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Fr.rc b/dll/win32/comdlg32/lang/cdlg_Fr.rc index 506d454f092..5cdcba5cdd3 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fr.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombre de copies :",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Copies assemblées", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_He.rc b/dll/win32/comdlg32/lang/cdlg_He.rc index 1b633c4ae8b..1206f386644 100644 --- a/dll/win32/comdlg32/lang/cdlg_He.rc +++ b/dll/win32/comdlg32/lang/cdlg_He.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "עותקים", grp2, 160, 92, 120,64, WS_GROUP LTEXT "מספר ה&עותקים:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&איסוף", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Hi.rc b/dll/win32/comdlg32/lang/cdlg_Hi.rc index 560ab24a141..e570bbcec91 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hi.rc @@ -355,7 +355,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "प्रतियां", grp2, 160, 92, 120,64, WS_GROUP LTEXT "&प्रतियों की संख्या:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&कोलेट", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Hu.rc b/dll/win32/comdlg32/lang/cdlg_Hu.rc index e6dd62601a0..e552e205660 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hu.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hu.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Másolatok", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Másola&tok száma:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Le&válogatás", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Id.rc b/dll/win32/comdlg32/lang/cdlg_Id.rc index b980af7edc0..e5de21f3aad 100644 --- a/dll/win32/comdlg32/lang/cdlg_Id.rc +++ b/dll/win32/comdlg32/lang/cdlg_Id.rc @@ -370,7 +370,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Salinan", grp2, 160, 92, 120, 64, WS_GROUP LTEXT "Jumlah &Salinan:", stc5, 168, 105, 68, 8 - ICON "", ico3, 170, 131, 76, 24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210, 131, 76, 24, WS_GROUP CONTROL "&Tersusun", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_It.rc b/dll/win32/comdlg32/lang/cdlg_It.rc index 88fd2e80d1c..aafde5ce33b 100644 --- a/dll/win32/comdlg32/lang/cdlg_It.rc +++ b/dll/win32/comdlg32/lang/cdlg_It.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numero di &copie:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Fascicola", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Ja.rc b/dll/win32/comdlg32/lang/cdlg_Ja.rc index a73756a5fc5..e6728054a45 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ja.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ja.rc @@ -369,7 +369,7 @@ FONT 9, "MS UI Gothic" GROUPBOX "印刷部数", grp2, 160, 92, 120,64, WS_GROUP LTEXT "部数(&C):",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "部単位で印刷(&O)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Ko.rc b/dll/win32/comdlg32/lang/cdlg_Ko.rc index f66dea5007b..eea8e56194a 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ko.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ko.rc @@ -369,7 +369,7 @@ FONT 9, "MS Shell Dlg" GROUPBOX "복사본", grp2, 160, 92, 120,64, WS_GROUP LTEXT "복사본 갯수(&C):",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "정렬(&O)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Lt.rc b/dll/win32/comdlg32/lang/cdlg_Lt.rc index 54224d03dbe..db04254f4ef 100644 --- a/dll/win32/comdlg32/lang/cdlg_Lt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Lt.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopijos", grp2, 160, 92, 120,64, WS_GROUP LTEXT "&Kopijų skaičius:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Su&dėst.", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Nl.rc b/dll/win32/comdlg32/lang/cdlg_Nl.rc index 95946e0abe8..d0332fc57d2 100644 --- a/dll/win32/comdlg32/lang/cdlg_Nl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Nl.rc @@ -368,7 +368,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Aantal", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Aantal e&xemplaren:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Sorteren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_No.rc b/dll/win32/comdlg32/lang/cdlg_No.rc index bfe3a97a75a..4ad155a6cf0 100644 --- a/dll/win32/comdlg32/lang/cdlg_No.rc +++ b/dll/win32/comdlg32/lang/cdlg_No.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopier", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Antall &kopier:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "S&orter", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Pl.rc b/dll/win32/comdlg32/lang/cdlg_Pl.rc index 623f40d5bd4..66584d79e97 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pl.rc @@ -366,7 +366,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc13, 55, 72, 153,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Lczba &kopii:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Sortuj", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Zakres wydruku", grp1, 8,92, 144,64, WS_GROUP diff --git a/dll/win32/comdlg32/lang/cdlg_Pt.rc b/dll/win32/comdlg32/lang/cdlg_Pt.rc index 4c0b23e3537..1dc022f9601 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -353,7 +353,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc13, 65, 72, 212, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Cópias", grp2, 160, 92, 120, 64, WS_GROUP LTEXT "Número de &cópias:", stc5, 168, 105, 68, 8 - ICON "", ico3, 170, 131, 76, 24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210, 131, 76, 24, WS_GROUP CONTROL "&Agrupar", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER GROUPBOX "Faixa de impressão", grp1, 8, 92, 144, 64, WS_GROUP diff --git a/dll/win32/comdlg32/lang/cdlg_Ro.rc b/dll/win32/comdlg32/lang/cdlg_Ro.rc index 147cb7ed8ff..9168023f61e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -371,7 +371,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Cópii", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numă&r de cópii:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Colaționate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Ru.rc b/dll/win32/comdlg32/lang/cdlg_Ru.rc index ba88688cb8d..8974c48cdb5 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Копии", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Число &копий:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Разобрать по копиям", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Si.rc b/dll/win32/comdlg32/lang/cdlg_Si.rc index 6bf7d06c463..cae5221c224 100644 --- a/dll/win32/comdlg32/lang/cdlg_Si.rc +++ b/dll/win32/comdlg32/lang/cdlg_Si.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopije", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Število &kopij:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Z&biranje", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Sk.rc b/dll/win32/comdlg32/lang/cdlg_Sk.rc index 1587c2c553f..01cc3b96f12 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sk.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kópie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Počet &kópií:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Sq.rc b/dll/win32/comdlg32/lang/cdlg_Sq.rc index 0ce974174fb..e319ad191e6 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sq.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sq.rc @@ -373,7 +373,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopjon", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numri i kopjeve:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Mbledh", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Sr.rc b/dll/win32/comdlg32/lang/cdlg_Sr.rc index b7dbbfdf15c..62c1f4a04c0 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sr.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Number of &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Sv.rc b/dll/win32/comdlg32/lang/cdlg_Sv.rc index d95436b9582..8cedb2a0e9e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sv.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sv.rc @@ -368,7 +368,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopior", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Antal k&opior:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Sortera", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Th.rc b/dll/win32/comdlg32/lang/cdlg_Th.rc index ea7d0fded34..5e84dd2cb37 100644 --- a/dll/win32/comdlg32/lang/cdlg_Th.rc +++ b/dll/win32/comdlg32/lang/cdlg_Th.rc @@ -368,7 +368,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "สําเนา", grp2, 160, 92, 120,64, WS_GROUP LTEXT "กี่สําเนา:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "จัดเรียงตามลําดับ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Tr.rc b/dll/win32/comdlg32/lang/cdlg_Tr.rc index 0e5347de039..fe1962bd992 100644 --- a/dll/win32/comdlg32/lang/cdlg_Tr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Tr.rc @@ -368,7 +368,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Kopyalar", grp2, 160, 92, 120,64, WS_GROUP LTEXT "K&opya Sayısı:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Ha&rmanla", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Uk.rc b/dll/win32/comdlg32/lang/cdlg_Uk.rc index ed5de3f41c6..fe4567e3502 100644 --- a/dll/win32/comdlg32/lang/cdlg_Uk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Uk.rc @@ -369,7 +369,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Копії", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Кількість &копій:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Розбити", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/lang/cdlg_Zh.rc b/dll/win32/comdlg32/lang/cdlg_Zh.rc index b0ab7b13c6a..af318908f0c 100644 --- a/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -371,7 +371,7 @@ FONT 9, "宋体" GROUPBOX "份数", grp2, 160, 92, 120,64, WS_GROUP LTEXT "份数(&C)：",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "逐份打印(&O)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER diff --git a/dll/win32/comdlg32/printdlg.c b/dll/win32/comdlg32/printdlg.c index 01dccc5ead7..70827f10ce7 100644 --- a/dll/win32/comdlg32/printdlg.c +++ b/dll/win32/comdlg32/printdlg.c @@ -1171,10 +1171,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru CheckRadioButton(hDlg, rad1, rad3, rad3); } - /* Collate pages - * - * FIXME: The ico3 is not displayed for some reason. I don't know why. - */ + /* Collate pages */ if (lppd->Flags & PD_COLLATE) { SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON, (LPARAM)PrintStructures->hCollateIcon); @@ -1378,10 +1375,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, CheckRadioButton(hDlg, rad1, rad3, rad3); } - /* Collate pages - * - * FIXME: The ico3 is not displayed for some reason. I don't know why. - */ + /* Collate pages */ if (lppd->Flags & PD_COLLATE) { SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON, (LPARAM)PrintStructures->hCollateIcon);

3 years, 5 months

[reactos] 01/01: Simplify CDefaultContextMenu by using CAtlList (#3405)

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db39a50c732a016965f67… commit db39a50c732a016965f67fe93b848663da6121f8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 17 05:01:03 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 17 13:01:03 2021 +0900 Simplify CDefaultContextMenu by using CAtlList (#3405) --- dll/win32/shell32/CDefaultContextMenu.cpp | 244 ++++++++++++------------------ dll/win32/shell32/precomp.h | 1 + 2 files changed, 97 insertions(+), 148 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index dde98873390..fc1e5e97ff2 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -15,15 +15,13 @@ typedef struct _DynamicShellEntry_ UINT iIdCmdFirst; UINT NumIds; CLSID ClassID; - IContextMenu *pCM; - struct _DynamicShellEntry_ *pNext; + CComPtr<IContextMenu> pCM; } DynamicShellEntry, *PDynamicShellEntry; typedef struct _StaticShellEntry_ { - LPWSTR szVerb; + CStringW Verb; HKEY hkClass; - struct _StaticShellEntry_ *pNext; } StaticShellEntry, *PStaticShellEntry; @@ -69,10 +67,10 @@ class CDefaultContextMenu : UINT m_cKeys; PIDLIST_ABSOLUTE m_pidlFolder; DWORD m_bGroupPolicyActive; - PDynamicShellEntry m_pDynamicEntries; /* first dynamic shell extension entry */ + CAtlList<DynamicShellEntry> m_DynamicEntries; UINT m_iIdSHEFirst; /* first used id */ UINT m_iIdSHELast; /* last used id */ - PStaticShellEntry m_pStaticEntries; /* first static shell extension entry */ + CAtlList<StaticShellEntry> m_StaticEntries; UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ UINT m_iIdCBFirst; /* first callback used id */ @@ -83,8 +81,8 @@ class CDefaultContextMenu : HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); void AddStaticEntriesForKey(HKEY hKey); - BOOL IsShellExtensionAlreadyLoaded(const CLSID *pclsid); - HRESULT LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid); + BOOL IsShellExtensionAlreadyLoaded(REFCLSID clsid); + HRESULT LoadDynamicContextMenuHandler(HKEY hKey, REFCLSID clsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); @@ -145,41 +143,21 @@ CDefaultContextMenu::CDefaultContextMenu() : m_cKeys(NULL), m_pidlFolder(NULL), m_bGroupPolicyActive(0), - m_pDynamicEntries(NULL), m_iIdSHEFirst(0), m_iIdSHELast(0), - m_pStaticEntries(NULL), m_iIdSCMFirst(0), m_iIdSCMLast(0), m_iIdCBFirst(0), m_iIdCBLast(0), m_iIdDfltFirst(0), m_iIdDfltLast(0) - { } CDefaultContextMenu::~CDefaultContextMenu() { - /* Free dynamic shell extension entries */ - PDynamicShellEntry pDynamicEntry = m_pDynamicEntries, pNextDynamic; - while (pDynamicEntry) - { - pNextDynamic = pDynamicEntry->pNext; - pDynamicEntry->pCM->Release(); - HeapFree(GetProcessHeap(), 0, pDynamicEntry); - pDynamicEntry = pNextDynamic; - } - - /* Free static shell extension entries */ - PStaticShellEntry pStaticEntry = m_pStaticEntries, pNextStatic; - while (pStaticEntry) - { - pNextStatic = pStaticEntry->pNext; - HeapFree(GetProcessHeap(), 0, pStaticEntry->szVerb); - HeapFree(GetProcessHeap(), 0, pStaticEntry); - pStaticEntry = pNextStatic; - } + m_DynamicEntries.RemoveAll(); + m_StaticEntries.RemoveAll(); for (UINT i = 0; i < m_cKeys; i++) RegCloseKey(m_aKeys[i]); @@ -253,40 +231,28 @@ HRESULT CDefaultContextMenu::_DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb) { - PStaticShellEntry pEntry = m_pStaticEntries, pLastEntry = NULL; - while(pEntry) + POSITION it = m_StaticEntries.GetHeadPosition(); + while (it != NULL) { - if (!wcsicmp(pEntry->szVerb, szVerb)) + const StaticShellEntry& info = m_StaticEntries.GetNext(it); + if (info.Verb.CompareNoCase(szVerb) == 0) { /* entry already exists */ return; } - pLastEntry = pEntry; - pEntry = pEntry->pNext; } TRACE("adding verb %s\n", debugstr_w(szVerb)); - pEntry = (StaticShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(StaticShellEntry)); - if (pEntry) - { - pEntry->pNext = NULL; - pEntry->szVerb = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(szVerb) + 1) * sizeof(WCHAR)); - if (pEntry->szVerb) - wcscpy(pEntry->szVerb, szVerb); - pEntry->hkClass = hkeyClass; - } - if (!wcsicmp(szVerb, L"open")) { /* open verb is always inserted in front */ - pEntry->pNext = m_pStaticEntries; - m_pStaticEntries = pEntry; + m_StaticEntries.AddHead({ szVerb, hkeyClass }); } - else if (pLastEntry) - pLastEntry->pNext = pEntry; else - m_pStaticEntries = pEntry; + { + m_StaticEntries.AddTail({ szVerb, hkeyClass }); + } } void CDefaultContextMenu::AddStaticEntriesForKey(HKEY hKey) @@ -333,35 +299,33 @@ HasClipboardData() } BOOL -CDefaultContextMenu::IsShellExtensionAlreadyLoaded(const CLSID *pclsid) +CDefaultContextMenu::IsShellExtensionAlreadyLoaded(REFCLSID clsid) { - PDynamicShellEntry pEntry = m_pDynamicEntries; - - while (pEntry) + POSITION it = m_DynamicEntries.GetHeadPosition(); + while (it != NULL) { - if (!memcmp(&pEntry->ClassID, pclsid, sizeof(CLSID))) + const DynamicShellEntry& info = m_DynamicEntries.GetNext(it); + if (info.ClassID == clsid) return TRUE; - pEntry = pEntry->pNext; } return FALSE; } HRESULT -CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid) +CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, REFCLSID clsid) { HRESULT hr; + TRACE("LoadDynamicContextMenuHandler entered with This %p hKey %p pclsid %s\n", this, hKey, wine_dbgstr_guid(&clsid)); - TRACE("LoadDynamicContextMenuHandler entered with This %p hKey %p pclsid %s\n", this, hKey, wine_dbgstr_guid(pclsid)); - - if (IsShellExtensionAlreadyLoaded(pclsid)) + if (IsShellExtensionAlreadyLoaded(clsid)) return S_OK; CComPtr<IContextMenu> pcm; - hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IContextMenu, &pcm)); + hr = SHCoCreateInstance(NULL, &clsid, NULL, IID_PPV_ARG(IContextMenu, &pcm)); if (FAILED(hr)) { - ERR("SHCoCreateInstance(IContextMenu) failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(pclsid), hr); + ERR("SHCoCreateInstance(IContextMenu) failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(&clsid), hr); return hr; } @@ -369,41 +333,21 @@ CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsi hr = pcm->QueryInterface(IID_PPV_ARG(IShellExtInit, &pExtInit)); if (FAILED(hr)) { - ERR("IContextMenu->QueryInterface(IShellExtInit) failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(pclsid), hr); + ERR("IContextMenu->QueryInterface(IShellExtInit) failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(&clsid), hr); return hr; } hr = pExtInit->Initialize(m_pidlFolder, m_pDataObj, hKey); if (FAILED(hr)) { - WARN("IShellExtInit::Initialize failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(pclsid), hr); + WARN("IShellExtInit::Initialize failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(&clsid), hr); return hr; } if (m_site) IUnknown_SetSite(pcm, m_site); - PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); - if (!pEntry) - return E_OUTOFMEMORY; - - pEntry->iIdCmdFirst = 0; - pEntry->pNext = NULL; - pEntry->NumIds = 0; - pEntry->pCM = pcm.Detach(); - memcpy(&pEntry->ClassID, pclsid, sizeof(CLSID)); - - if (m_pDynamicEntries) - { - PDynamicShellEntry pLastEntry = m_pDynamicEntries; - - while (pLastEntry->pNext) - pLastEntry = pLastEntry->pNext; - - pLastEntry->pNext = pEntry; - } - else - m_pDynamicEntries = pEntry; + m_DynamicEntries.AddTail({ 0, 0, clsid, pcm }); return S_OK; } @@ -463,7 +407,7 @@ CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey) } } - hr = LoadDynamicContextMenuHandler(hKey, &clsid); + hr = LoadDynamicContextMenuHandler(hKey, clsid); if (FAILED(hr)) WARN("Failed to get context menu entires from shell extension! clsid: %S\n", pwszClsid); } @@ -477,27 +421,27 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN { UINT cIds = 0; - if (!m_pDynamicEntries) + if (m_DynamicEntries.IsEmpty()) return cIds; - PDynamicShellEntry pEntry = m_pDynamicEntries; - do + POSITION it = m_DynamicEntries.GetHeadPosition(); + while (it != NULL) { - HRESULT hr = pEntry->pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, CMF_NORMAL); + DynamicShellEntry& info = m_DynamicEntries.GetNext(it); + + HRESULT hr = info.pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, CMF_NORMAL); if (SUCCEEDED(hr)) { - pEntry->iIdCmdFirst = cIds; - pEntry->NumIds = LOWORD(hr); - (*pIndexMenu) += pEntry->NumIds; + info.iIdCmdFirst = cIds; + info.NumIds = LOWORD(hr); + (*pIndexMenu) += info.NumIds; - cIds += pEntry->NumIds; - if(idCmdFirst + cIds >= idCmdLast) + cIds += info.NumIds; + if (idCmdFirst + cIds >= idCmdLast) break; } - TRACE("pEntry %p hr %x contextmenu %p cmdfirst %x num ids %x\n", pEntry, hr, pEntry->pCM, pEntry->iIdCmdFirst, pEntry->NumIds); - pEntry = pEntry->pNext; - } while (pEntry); - + TRACE("pEntry hr %x contextmenu %p cmdfirst %x num ids %x\n", hr, info.pCM.p, info.iIdCmdFirst, info.NumIds); + } return cIds; } @@ -519,50 +463,53 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( mii.fType = MFT_STRING; mii.dwTypeData = NULL; - PStaticShellEntry pEntry = m_pStaticEntries; - - while (pEntry) + POSITION it = m_StaticEntries.GetHeadPosition(); + bool first = true; + while (it != NULL) { + StaticShellEntry& info = m_StaticEntries.GetNext(it); + fState = MFS_ENABLED; mii.dwTypeData = NULL; /* set first entry as default */ - if (pEntry == m_pStaticEntries) + if (first) + { fState |= MFS_DEFAULT; + first = false; + } - if (!wcsicmp(pEntry->szVerb, L"open")) + if (info.Verb.CompareNoCase(L"open") == 0) { /* override default when open verb is found */ fState |= MFS_DEFAULT; idResource = IDS_OPEN_VERB; } - else if (!wcsicmp(pEntry->szVerb, L"explore")) + else if (info.Verb.CompareNoCase(L"explore") == 0) idResource = IDS_EXPLORE_VERB; - else if (!wcsicmp(pEntry->szVerb, L"runas")) + else if (info.Verb.CompareNoCase(L"runas") == 0) idResource = IDS_RUNAS_VERB; - else if (!wcsicmp(pEntry->szVerb, L"edit")) + else if (info.Verb.CompareNoCase(L"edit") == 0) idResource = IDS_EDIT_VERB; - else if (!wcsicmp(pEntry->szVerb, L"find")) + else if (info.Verb.CompareNoCase(L"find") == 0) idResource = IDS_FIND_VERB; - else if (!wcsicmp(pEntry->szVerb, L"print")) + else if (info.Verb.CompareNoCase(L"print") == 0) idResource = IDS_PRINT_VERB; - else if (!wcsicmp(pEntry->szVerb, L"printto")) + else if (info.Verb.CompareNoCase(L"printto") == 0) { - pEntry = pEntry->pNext; continue; } else idResource = 0; /* By default use verb for menu item name */ - mii.dwTypeData = pEntry->szVerb; + mii.dwTypeData = (LPWSTR)info.Verb.GetString(); WCHAR wszKey[256]; HRESULT hr; - hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->szVerb); + hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", info.Verb.GetString()); if (FAILED_UNEXPECTEDLY(hr)) { - pEntry = pEntry->pNext; continue; } @@ -575,7 +522,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( else ERR("Failed to load string\n"); - LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); + LONG res = RegOpenKeyW(info.hkClass, wszKey, &hkVerb); if (res == ERROR_SUCCESS) { res = RegQueryValueExW(hkVerb, L"Extended", NULL, NULL, NULL, NULL); @@ -586,7 +533,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( } else { - LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); + LONG res = RegOpenKeyW(info.hkClass, wszKey, &hkVerb); if (res == ERROR_SUCCESS) { DWORD cbVerb = sizeof(wszVerb); @@ -614,8 +561,6 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( cIds++; } - pEntry = pEntry->pNext; - if (mii.wID >= iIdCmdLast) break; } @@ -1001,18 +946,21 @@ CDefaultContextMenu::DoCreateNewFolder( PDynamicShellEntry CDefaultContextMenu::GetDynamicEntry(UINT idCmd) { - PDynamicShellEntry pEntry = m_pDynamicEntries; + POSITION it = m_DynamicEntries.GetHeadPosition(); + while (it != NULL) + { + DynamicShellEntry& info = m_DynamicEntries.GetNext(it); - while(pEntry && idCmd >= pEntry->iIdCmdFirst + pEntry->NumIds) - pEntry = pEntry->pNext; + if (idCmd >= info.iIdCmdFirst + info.NumIds) + continue; - if (!pEntry) - return NULL; + if (idCmd < info.iIdCmdFirst || idCmd > info.iIdCmdFirst + info.NumIds) + return NULL; - if (idCmd < pEntry->iIdCmdFirst || idCmd > pEntry->iIdCmdFirst + pEntry->NumIds) - return NULL; + return &info; + } - return pEntry; + return NULL; } // FIXME: 260 is correct, but should this be part of the SDK or just MAX_PATH? @@ -1093,7 +1041,7 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticSh FlagsName = L"BrowserFlags"; /* Try to get the flag from the verb */ - hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->szVerb); + hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->Verb.GetString()); if (FAILED_UNEXPECTEDLY(hr)) return 0; @@ -1152,7 +1100,7 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, sei.cbSize = sizeof(sei); sei.hwnd = lpcmi->hwnd; sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = pEntry->szVerb; + sei.lpVerb = pEntry->Verb; sei.lpDirectory = wszDir; sei.lpIDList = pidlFull; sei.hkeyClass = pEntry->hkClass; @@ -1173,16 +1121,16 @@ HRESULT CDefaultContextMenu::InvokeRegVerb( LPCMINVOKECOMMANDINFO lpcmi) { - PStaticShellEntry pEntry = m_pStaticEntries; - INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; + INT iCmd = LOWORD(lpcmi->lpVerb); HRESULT hr; UINT i; - while (pEntry && (iCmd--) > 0) - pEntry = pEntry->pNext; + POSITION it = m_StaticEntries.FindIndex(iCmd); - if (iCmd > 0) - return E_FAIL; + if (it == NULL) + return E_INVALIDARG; + + PStaticShellEntry pEntry = &m_StaticEntries.GetAt(it); /* Get the browse flags to see if we need to browse */ DWORD wFlags = BrowserFlagsFromVerb(lpcmi, pEntry); @@ -1236,14 +1184,14 @@ CDefaultContextMenu::InvokeCommand( CmdId = LOWORD(LocalInvokeInfo.lpVerb); - if (m_pDynamicEntries && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) + if (!m_DynamicEntries.IsEmpty() && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) { LocalInvokeInfo.lpVerb -= m_iIdSHEFirst; Result = InvokeShellExt(&LocalInvokeInfo); return Result; } - if (m_pStaticEntries && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) + if (!m_StaticEntries.IsEmpty() && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) { LocalInvokeInfo.lpVerb -= m_iIdSCMFirst; Result = InvokeRegVerb(&LocalInvokeInfo); @@ -1332,7 +1280,7 @@ CDefaultContextMenu::GetCommandString( UINT CmdId = LOWORD(idCommand); - if (m_pDynamicEntries && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) + if (!m_DynamicEntries.IsEmpty() && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) { idCommand -= m_iIdSHEFirst; PDynamicShellEntry pEntry = GetDynamicEntry(idCommand); @@ -1347,7 +1295,7 @@ CDefaultContextMenu::GetCommandString( uMaxNameLen); } - if (m_pStaticEntries && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) + if (!m_StaticEntries.IsEmpty() && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) { /* Validation just returns S_OK on a match. The id exists. */ if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW) @@ -1355,19 +1303,19 @@ CDefaultContextMenu::GetCommandString( CmdId -= m_iIdSCMFirst; - PStaticShellEntry pEntry = m_pStaticEntries; - while (pEntry && (CmdId--) > 0) - pEntry = pEntry->pNext; + POSITION it = m_StaticEntries.FindIndex(CmdId); - if (!pEntry) + if (it == NULL) return E_INVALIDARG; + PStaticShellEntry pEntry = &m_StaticEntries.GetAt(it); + if (uFlags == GCS_VERBW) - return StringCchCopyW((LPWSTR)lpszName, uMaxNameLen, pEntry->szVerb); + return StringCchCopyW((LPWSTR)lpszName, uMaxNameLen, pEntry->Verb); if (uFlags == GCS_VERBA) { - if (SHUnicodeToAnsi(pEntry->szVerb, lpszName, uMaxNameLen)) + if (SHUnicodeToAnsi(pEntry->Verb, lpszName, uMaxNameLen)) return S_OK; } @@ -1464,11 +1412,11 @@ CDefaultContextMenu::HandleMenuMsg2( { if (uMsg == WM_INITMENUPOPUP) { - PDynamicShellEntry pEntry = m_pDynamicEntries; - while (pEntry) + POSITION it = m_DynamicEntries.GetHeadPosition(); + while (it != NULL) { - SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); - pEntry = pEntry->pNext; + DynamicShellEntry& info = m_DynamicEntries.GetNext(it); + SHForwardContextMenuMsg(info.pCM, uMsg, wParam, lParam, plResult, TRUE); } return S_OK; } diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 9ae77f4b794..9b422353e6c 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -32,6 +32,7 @@ #include <atlwin.h> #include <atlstr.h> #include <atlsimpcoll.h> +#include <atlcoll.h> #include <powrprof.h> #include <winnetwk.h> #include <objsafe.h>

3 years, 5 months

[reactos] 01/01: [EXPLORER] Fixed issue in TaskBar AUTOHIDE CORE-17093 (#2863)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3a4309d0c7ed8a10d69b… commit c3a4309d0c7ed8a10d69b4e34ee9956b86d0d0aa Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Dec 17 03:42:19 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 17 12:42:19 2021 +0900 [EXPLORER] Fixed issue in TaskBar AUTOHIDE CORE-17093 (#2863) CORE-17093 --- base/shell/explorer/traywnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index b052b856404..0f3005ca950 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1881,13 +1881,13 @@ ChangePos: m_AutoHideOffset.cy = 0; m_AutoHideOffset.cx -= AUTOHIDE_SPEED_HIDE; if (m_AutoHideOffset.cx < -w) - m_AutoHideOffset.cx = -w; + m_AutoHideOffset.cx = w; break; case ABE_TOP: m_AutoHideOffset.cx = 0; m_AutoHideOffset.cy -= AUTOHIDE_SPEED_HIDE; if (m_AutoHideOffset.cy < -h) - m_AutoHideOffset.cy = -h; + m_AutoHideOffset.cy = h; break; case ABE_RIGHT: m_AutoHideOffset.cy = 0;

3 years, 5 months

[reactos] 01/01: [NTUSER] Fix SwitchToThisWindow

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f643fb301bb194bc4574e… commit f643fb301bb194bc4574edc739aff045c98384e1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 17 11:38:23 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 17 11:38:23 2021 +0900 [NTUSER] Fix SwitchToThisWindow Taskbar task buttons were not working correctly due to this bug. CORE-17911 --- win32ss/user/ntuser/simplecall.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 2a2c92ac0ec..76ea0340c7b 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -521,11 +521,14 @@ NtUserCallTwoParam( { co_WinPosSetWindowPos(pwndActive, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOSENDCHANGING | SWP_ASYNCWINDOWPOS); + SWP_ASYNCWINDOWPOS); } + + UserSetActiveWindow(Window); + break; } - UserSetActiveWindow(Window); + co_IntSetForegroundWindowMouse(Window); if (fAltTab && (Window->style & WS_MINIMIZE)) {

3 years, 5 months

[reactos] 02/02: [NTOS:PNP] Let pnproot only report already detected devices

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0358fcf9e4197106854e5… commit 0358fcf9e4197106854e59bb637f6cef80dfda85 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 13 23:27:01 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Dec 16 16:14:21 2021 +0100 [NTOS:PNP] Let pnproot only report already detected devices Ignore devices which have DeviceReported=1 in instance key and not DeviceReported=1 in Control key. CORE-17874 --- ntoskrnl/io/pnpmgr/pnproot.c | 171 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 145 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index cc489c98670..c41844b64d3 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -94,7 +94,7 @@ LocateChildDevice( IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension, IN PCUNICODE_STRING DeviceId, IN PCWSTR InstanceId, - OUT PPNPROOT_DEVICE* ChildDevice) + OUT PPNPROOT_DEVICE* ChildDevice OPTIONAL) { PPNPROOT_DEVICE Device; UNICODE_STRING InstanceIdU; @@ -116,7 +116,8 @@ LocateChildDevice( RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) { /* They do, so set the pointer and return success */ - *ChildDevice = Device; + if (ChildDevice) + *ChildDevice = Device; return STATUS_SUCCESS; } } @@ -261,26 +262,23 @@ tryagain: QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) + for (NextInstance = 0; NextInstance <= 9999; NextInstance++) { - for (NextInstance = 0; NextInstance <= 9999; NextInstance++) - { - _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); - Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device); - if (Status == STATUS_NO_SUCH_DEVICE) - break; - } + _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); + Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, NULL); + if (Status == STATUS_NO_SUCH_DEVICE) + break; + } - if (NextInstance > 9999) - { - DPRINT1("Too many legacy devices reported for service '%wZ'\n", ServiceName); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } + if (NextInstance > 9999) + { + DPRINT1("Too many legacy devices reported for service '%wZ'\n", ServiceName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); - Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device); + Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, NULL); if (Status != STATUS_NO_SUCH_DEVICE || NextInstance > 9999) { DPRINT1("NextInstance value is corrupt! (%lu)\n", NextInstance); @@ -554,6 +552,114 @@ cleanup: return Status; } +static NTSTATUS +IopShouldProcessDevice( + IN HANDLE SubKey, + IN PCWSTR InstanceID) +{ + UNICODE_STRING DeviceReportedValue = RTL_CONSTANT_STRING(L"DeviceReported"); + UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); + UNICODE_STRING InstanceIDU; + PKEY_VALUE_FULL_INFORMATION pKeyValueFullInformation; + HANDLE InstanceKey, ControlKey; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG Size, DeviceReported, ResultLength; + NTSTATUS Status; + + Size = 128; + pKeyValueFullInformation = ExAllocatePool(PagedPool, Size); + if (!pKeyValueFullInformation) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Open Instance key */ + RtlInitUnicodeString(&InstanceIDU, InstanceID); + InitializeObjectAttributes(&ObjectAttributes, + &InstanceIDU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + SubKey, + NULL); + Status = ZwOpenKey(&InstanceKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ExFreePool(pKeyValueFullInformation); + return Status; + } + + /* Read 'DeviceReported' Key */ + Status = ZwQueryValueKey(InstanceKey, &DeviceReportedValue, KeyValueFullInformation, pKeyValueFullInformation, Size, &ResultLength); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + ZwClose(InstanceKey); + ExFreePool(pKeyValueFullInformation); + DPRINT("No 'DeviceReported' value\n"); + return STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) + { + ZwClose(InstanceKey); + ExFreePool(pKeyValueFullInformation); + return Status; + } + if (pKeyValueFullInformation->Type != REG_DWORD || pKeyValueFullInformation->DataLength != sizeof(DeviceReported)) + { + ZwClose(InstanceKey); + ExFreePool(pKeyValueFullInformation); + return STATUS_UNSUCCESSFUL; + } + RtlCopyMemory(&DeviceReported, (PVOID)((ULONG_PTR)pKeyValueFullInformation + pKeyValueFullInformation->DataOffset), sizeof(DeviceReported)); + /* FIXME: Check DeviceReported value? */ + ASSERT(DeviceReported == 1); + + /* Open Control key */ + InitializeObjectAttributes(&ObjectAttributes, + &Control, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + InstanceKey, + NULL); + Status = ZwOpenKey(&ControlKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + ZwClose(InstanceKey); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DPRINT("No 'Control' key\n"); + return STATUS_NO_SUCH_DEVICE; + } + else if (!NT_SUCCESS(Status)) + { + ExFreePool(pKeyValueFullInformation); + return Status; + } + + /* Read 'DeviceReported' Key */ + Status = ZwQueryValueKey(ControlKey, &DeviceReportedValue, KeyValueFullInformation, pKeyValueFullInformation, Size, &ResultLength); + ZwClose(ControlKey); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + ExFreePool(pKeyValueFullInformation); + DPRINT("No 'DeviceReported' value\n"); + return STATUS_NO_SUCH_DEVICE; + } + else if (!NT_SUCCESS(Status)) + { + ExFreePool(pKeyValueFullInformation); + return Status; + } + if (pKeyValueFullInformation->Type != REG_DWORD || pKeyValueFullInformation->DataLength != sizeof(DeviceReported)) + { + ExFreePool(pKeyValueFullInformation); + return STATUS_UNSUCCESSFUL; + } + RtlCopyMemory(&DeviceReported, (PVOID)((ULONG_PTR)pKeyValueFullInformation + pKeyValueFullInformation->DataOffset), sizeof(DeviceReported)); + /* FIXME: Check DeviceReported value? */ + ASSERT(DeviceReported == 1); + + ExFreePool(pKeyValueFullInformation); + return STATUS_SUCCESS; +} + static NTSTATUS EnumerateDevices( IN PDEVICE_OBJECT DeviceObject) @@ -725,17 +831,30 @@ EnumerateDevices( RtlAppendUnicodeToString(&DevicePath, REGSTR_KEY_ROOTENUM L"\\"); RtlAppendUnicodeStringToString(&DevicePath, &SubKeyName); DPRINT("Found device %wZ\\%S!\n", &DevicePath, SubKeyInfo->Name); - Status = CreateDeviceFromRegistry(DeviceExtension, - &DevicePath, - SubKeyInfo->Name, - SubKeyHandle); - /* If CreateDeviceFromRegistry didn't take ownership and zero this, - * we need to free it - */ - RtlFreeUnicodeString(&DevicePath); + Status = IopShouldProcessDevice(SubKeyHandle, SubKeyInfo->Name); + if (NT_SUCCESS(Status)) + { + Status = CreateDeviceFromRegistry(DeviceExtension, + &DevicePath, + SubKeyInfo->Name, + SubKeyHandle); + + /* If CreateDeviceFromRegistry didn't take ownership and zero this, + * we need to free it + */ + RtlFreeUnicodeString(&DevicePath); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + else if (Status == STATUS_NO_SUCH_DEVICE) + { + DPRINT("Skipping device %wZ\\%S (not reported yet)\n", &DevicePath, SubKeyInfo->Name); + } + else { goto cleanup; }

3 years, 5 months

[reactos] 01/02: [NTOS:PNP] Set DeviceReported=1 in Instance key and Control key of legacy devices at report time

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d380e9777c8c64cbb6ead… commit d380e9777c8c64cbb6eadb55442dd7e18f9a8ad4 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 13 23:25:20 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Dec 16 16:14:21 2021 +0100 [NTOS:PNP] Set DeviceReported=1 in Instance key and Control key of legacy devices at report time CORE-17874 --- ntoskrnl/io/pnpmgr/pnpreport.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 3357925ec65..9f6f06688bd 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -155,15 +155,19 @@ IoReportDetectedDevice( _In_ BOOLEAN ResourceAssigned, _Inout_ PDEVICE_OBJECT *DeviceObject) { + UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); + UNICODE_STRING DeviceReportedName = RTL_CONSTANT_STRING(L"DeviceReported"); + OBJECT_ATTRIBUTES ObjectAttributes; PDEVICE_NODE DeviceNode; PDEVICE_OBJECT Pdo; NTSTATUS Status; - HANDLE InstanceKey; + HANDLE InstanceKey, ControlKey; UNICODE_STRING ValueName, ServiceLongName, ServiceName; WCHAR HardwareId[256]; PWCHAR IfString; ULONG IdLength; ULONG LegacyValue; + ULONG DeviceReported = 1; DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); @@ -266,6 +270,39 @@ IoReportDetectedDevice( { DPRINT("Failed to write the Legacy value: 0x%x\n", Status); } + Status = ZwSetValueKey(InstanceKey, &DeviceReportedName, 0, REG_DWORD, &DeviceReported, sizeof(DeviceReported)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the DeviceReported value: 0x%x\n", Status); + } + + /* Set DeviceReported=1 in Control subkey */ + InitializeObjectAttributes(&ObjectAttributes, + &Control, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + InstanceKey, + NULL); + Status = ZwCreateKey(&ControlKey, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = ZwSetValueKey(ControlKey, + &DeviceReportedName, + 0, + REG_DWORD, + &DeviceReported, + sizeof(DeviceReported)); + ZwClose(ControlKey); + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set ReportedDevice=1 for device %wZ (status 0x%08lx)\n", &instancePath, Status); + } /* Add DETECTEDInterfaceType\DriverName */ IdLength = 0;

3 years, 5 months

[reactos] 01/01: [NTGDI] Strictly check pen style (#4164)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3622ebe4e8ae9e8ca4b2… commit e3622ebe4e8ae9e8ca4b2ad8c3aef8f52730ca3e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 16 10:47:57 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 16 10:47:57 2021 +0900 [NTGDI] Strictly check pen style (#4164) - Check the pen style and elegantly fail if the style was wrong. CORE-13819 --- win32ss/gdi/ntgdi/pen.c | 57 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/ntgdi/pen.c b/win32ss/gdi/ntgdi/pen.c index 76b6cd2a2f8..d3edbddc494 100644 --- a/win32ss/gdi/ntgdi/pen.c +++ b/win32ss/gdi/ntgdi/pen.c @@ -115,11 +115,54 @@ IntGdiExtCreatePen( DPRINT("Can't allocate pen\n"); return 0; } + hPen = pbrushPen->BaseObject.hHmgr; - // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. - if ((bOldStylePen) && (!dwWidth) && ((dwPenStyle & PS_STYLE_MASK) != PS_SOLID)) - dwWidth = 1; + if (bOldStylePen) + { + // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. + if (!dwWidth && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) + dwWidth = 1; + } + else + { + switch (dwPenStyle & PS_ENDCAP_MASK) + { + case PS_ENDCAP_ROUND: + case PS_ENDCAP_SQUARE: + case PS_ENDCAP_FLAT: + break; + + default: + goto ExitCleanup; + } + + switch (dwPenStyle & PS_JOIN_MASK) + { + case PS_JOIN_ROUND: + case PS_JOIN_BEVEL: + case PS_JOIN_MITER: + break; + + default: + goto ExitCleanup; + } + + switch (dwPenStyle & PS_TYPE_MASK) + { + case PS_COSMETIC: + if (dwWidth != 1 || ulBrushStyle != BS_SOLID) + goto ExitCleanup; + + break; + + case PS_GEOMETRIC: + break; + + default: + goto ExitCleanup; + } + } pbrushPen->lWidth = dwWidth; FLOATOBJ_SetLong(&pbrushPen->eWidth, pbrushPen->lWidth); @@ -131,16 +174,8 @@ IntGdiExtCreatePen( pbrushPen->dwStyleCount = 0; pbrushPen->pStyle = NULL; pbrushPen->ulStyleSize = 0; - pbrushPen->flAttrs = bOldStylePen ? BR_IS_OLDSTYLEPEN : BR_IS_PEN; - // If dwPenStyle is PS_COSMETIC, the width must be set to 1. - if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) - goto ExitCleanup; - // If dwPenStyle is PS_COSMETIC, the brush style must be BS_SOLID. - if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && (ulBrushStyle != BS_SOLID) ) - goto ExitCleanup; - switch (dwPenStyle & PS_STYLE_MASK) { case PS_NULL:

3 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

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