Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:EX] Fix SAL notations, `Timeout` parameter should be optional (#7482)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f4ef448de06148d5025e… commit 1f4ef448de06148d5025e99557b075015f37650a Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Nov 1 18:53:28 2024 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 1 11:53:28 2024 +0100 [NTOS:EX] Fix SAL notations, `Timeout` parameter should be optional (#7482) Fix warnings: E:\3rdRepo\ReactOS_Fork4\ntoskrnl\ex\keyedevt.c(458): warning C6387: 'Timeout' could be '0': this does not adhere to the specification for the function 'ExpWaitForKeyedEvent'. E:\3rdRepo\ReactOS_Fork4\ntoskrnl\ex\keyedevt.c(527): warning C6387: 'Timeout' could be '0': this does not adhere to the specification for the function 'ExpReleaseKeyedEvent'. JIRA issue: None. Proposed changes Timeout parameter of those two functions should be optional. --- ntoskrnl/ex/keyedevt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/keyedevt.c b/ntoskrnl/ex/keyedevt.c index 50678b66ebb..a83a7f6af69 100644 --- a/ntoskrnl/ex/keyedevt.c +++ b/ntoskrnl/ex/keyedevt.c @@ -114,7 +114,7 @@ ExpReleaseOrWaitForKeyedEvent( _Inout_ PEX_KEYED_EVENT KeyedEvent, _In_ PVOID KeyedWaitValue, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Timeout, + _In_opt_ PLARGE_INTEGER Timeout, _In_ BOOLEAN Release) { PETHREAD Thread, CurrentThread; @@ -242,7 +242,7 @@ ExpWaitForKeyedEvent( _Inout_ PEX_KEYED_EVENT KeyedEvent, _In_ PVOID KeyedWaitValue, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Timeout) + _In_opt_ PLARGE_INTEGER Timeout) { /* Call the generic internal function */ return ExpReleaseOrWaitForKeyedEvent(KeyedEvent,

8 months

[reactos] 01/01: [REACTOS] Fix 'writting' typos (#7484)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f784c65a22f16bd90415… commit 9f784c65a22f16bd904152bb5f162c5f86c428dc Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Nov 1 18:50:09 2024 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 1 11:50:09 2024 +0100 [REACTOS] Fix 'writting' typos (#7484) 3rd-party files are not modified. --- modules/rosapps/applications/sysutils/pedump/pedump.c | 2 +- modules/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp | 2 +- modules/rostests/tests/sertest/sertest.c | 2 +- sdk/lib/drivers/copysup/copysup.c | 4 ++-- sdk/lib/drivers/rdbsslib/rdbss.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rosapps/applications/sysutils/pedump/pedump.c b/modules/rosapps/applications/sysutils/pedump/pedump.c index 88706cf0c8b..f246404989c 100644 --- a/modules/rosapps/applications/sysutils/pedump/pedump.c +++ b/modules/rosapps/applications/sysutils/pedump/pedump.c @@ -3906,7 +3906,7 @@ GetSeparateDebugHeader ( // I tried to immitate the output of w32dasm disassembler. // which is a pretty good program. // but I am disappointed with this program and I myself -// am writting a disassembler. +// am writing a disassembler. // This PEdump program is a byproduct of that project. // so enjoy this program and I hope we will have a little more // knowledge on windows programming world. diff --git a/modules/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp b/modules/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp index 7db957414e2..cf97c0e9640 100644 --- a/modules/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp +++ b/modules/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp @@ -390,7 +390,7 @@ CheckValueArgument: DWORD dwBytesWritten; if (!WriteFile(hFile,pDataBuffer,dwValueSize,&dwBytesWritten,NULL)) { - rConsole.Write(_T("Error writting file.\n")); + rConsole.Write(_T("Error writing file.\n")); VERIFY(CloseHandle(hFile)); goto SkipValueCommand; } diff --git a/modules/rostests/tests/sertest/sertest.c b/modules/rostests/tests/sertest/sertest.c index f56f36ec83f..1fd70044815 100644 --- a/modules/rostests/tests/sertest/sertest.c +++ b/modules/rostests/tests/sertest/sertest.c @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) rxBuffer[i] = 0xFF; } printf("\n"); - printf("Writting transmit buffer to the serial port\n"); + printf("Writing transmit buffer to the serial port\n"); bResult = WriteFile(hPort, txBuffer, BUFSIZE, &dwNumWritten, NULL); if (!bResult) { printf("ERROR: failed to write to the serial port: %lx\n", (DWORD)bResult); diff --git a/sdk/lib/drivers/copysup/copysup.c b/sdk/lib/drivers/copysup/copysup.c index 69d7da144a3..5828c822cda 100644 --- a/sdk/lib/drivers/copysup/copysup.c +++ b/sdk/lib/drivers/copysup/copysup.c @@ -330,7 +330,7 @@ FsRtlCopyWrite2( return FALSE; } - /* And that we're not writting beyond allocation size */ + /* And that we're not writing beyond allocation size */ if (Fcb->AllocationSize.QuadPart < LastOffset.QuadPart) { ExReleaseResourceLite(Fcb->Resource); @@ -561,7 +561,7 @@ FsRtlCopyWrite2( return FALSE; } - /* And that we're not writting beyond allocation size + /* And that we're not writing beyond allocation size * and that we're not going above 4GB */ if ((Fcb->AllocationSize.LowPart < LastOffset.LowPart) || diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 4fe01867172..ba6839b298b 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -4047,7 +4047,7 @@ RxCommonWrite( return STATUS_INVALID_PARAMETER; } - /* Are we writting to EOF? */ + /* Are we writing to EOF? */ WriteToEof = ((ByteOffset.LowPart == FILE_WRITE_TO_END_OF_FILE) && (ByteOffset.HighPart == -1)); /* FIXME: validate length/offset */

8 months

[reactos] 01/01: [EXPLORER] Add tooltip for show desktop button (#7483)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=898cc5663d5ede3d6d595… commit 898cc5663d5ede3d6d595e7819cd2b14db18970a Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Fri Nov 1 01:09:22 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 1 01:09:22 2024 +0700 [EXPLORER] Add tooltip for show desktop button (#7483) CORE-15369 --- base/shell/explorer/lang/bg-BG.rc | 1 + base/shell/explorer/lang/cs-CZ.rc | 1 + base/shell/explorer/lang/de-DE.rc | 1 + base/shell/explorer/lang/en-US.rc | 1 + base/shell/explorer/lang/es-ES.rc | 1 + base/shell/explorer/lang/et-EE.rc | 1 + base/shell/explorer/lang/eu-ES.rc | 1 + base/shell/explorer/lang/fi-FI.rc | 1 + base/shell/explorer/lang/fr-FR.rc | 1 + base/shell/explorer/lang/he-IL.rc | 1 + base/shell/explorer/lang/hi-IN.rc | 1 + base/shell/explorer/lang/hu-HU.rc | 1 + base/shell/explorer/lang/id-ID.rc | 1 + base/shell/explorer/lang/it-IT.rc | 1 + base/shell/explorer/lang/ja-JP.rc | 1 + base/shell/explorer/lang/ko-KR.rc | 1 + base/shell/explorer/lang/lt-LT.rc | 1 + base/shell/explorer/lang/ms-MY.rc | 1 + base/shell/explorer/lang/nl-NL.rc | 1 + base/shell/explorer/lang/no-NO.rc | 1 + base/shell/explorer/lang/pl-PL.rc | 1 + base/shell/explorer/lang/pt-BR.rc | 1 + base/shell/explorer/lang/pt-PT.rc | 1 + base/shell/explorer/lang/ro-RO.rc | 1 + base/shell/explorer/lang/ru-RU.rc | 1 + base/shell/explorer/lang/sk-SK.rc | 1 + base/shell/explorer/lang/sq-AL.rc | 1 + base/shell/explorer/lang/tr-TR.rc | 1 + base/shell/explorer/lang/uk-UA.rc | 1 + base/shell/explorer/lang/zh-CN.rc | 1 + base/shell/explorer/lang/zh-HK.rc | 1 + base/shell/explorer/lang/zh-TW.rc | 1 + base/shell/explorer/resource.h | 1 + base/shell/explorer/traydeskbtn.cpp | 13 +++++++++++++ base/shell/explorer/traydeskbtn.h | 1 + 35 files changed, 47 insertions(+) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index 65585857c28..362a5ec523c 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Покажи отворените прозорци" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 96dacb3e5b2..4c42eb1e82e 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 719833d6f19..644d4e9c680 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -219,4 +219,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index 537d46dc5df..fb0d1968ec4 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 60a86cb2d29..bfa0fef9c2a 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -219,4 +219,5 @@ BEGIN IDS_RESTORE_ALL "&Mostrar ventanas abiertas" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index edac53dee40..a38cf6b6160 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index 1edc42304f1..da9a5ce7126 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "E&rakutsi irekitako leihoak" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 007d5a9139e..c174b17daaa 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index bc8250201c3..4a752edef8d 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Afficher les fenêtres ouvertes" IDS_TRAYWND_UNDO_CASCADE "Ann&uler cascade" IDS_TRAYWND_UNDO_TILE "Ann&uler mosaïque" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 7dcdaff4449..5031167a438 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 31f36698e65..6fccc2a320d 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "खुले हुऐ विंडोज &दिखाएं" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index 4e167f3160b..87bcce514ca 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Megnyitott ablakok megjelenítése" IDS_TRAYWND_UNDO_CASCADE "Lépcsőzetes elre&ndezés visszavonása" IDS_TRAYWND_UNDO_TILE "Mozaik elre&ndezés visszavonása" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index 10fd87f2493..468daf9a291 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Tampilkan Semua Jendela" IDS_TRAYWND_UNDO_CASCADE "&Urungkan Tumpukan" IDS_TRAYWND_UNDO_TILE "U&rungkan Ubin" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index 4f584bc7613..26d55d51693 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 33f92fd6784..30d173b2556 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -217,4 +217,5 @@ BEGIN IDS_RESTORE_ALL "開いているウィンドウを表示(&S)" IDS_TRAYWND_UNDO_CASCADE "「重ねて表示」を元に戻す(&U)" IDS_TRAYWND_UNDO_TILE "「ウィンドウを並べて表示」を元に戻す(&U)" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index e8603060ba8..0feac642730 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "열린 창 보기(&S)" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 5627b7f0267..1471474371a 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 31ea4cb6d1b..0d2f9323713 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index 702d2ab2bf8..3dda01b0016 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index 351d7942af0..e88e1967550 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 6c2acc52b9b..270484ec0e8 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -218,4 +218,5 @@ BEGIN IDS_RESTORE_ALL "&Pokaż otwarte okna" IDS_TRAYWND_UNDO_CASCADE "&Cofnij kaskadowe ułożenie okien" IDS_TRAYWND_UNDO_TILE "&Cofnij sąsiadujące ułożenie okien" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index c2df38de08b..1e030708acb 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 39c9868b253..31ab1da2a4f 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -217,4 +217,5 @@ BEGIN IDS_RESTORE_ALL "&Mostrar janelas abertas" IDS_TRAYWND_UNDO_CASCADE "Desfazer &cascata" IDS_TRAYWND_UNDO_TILE "Desfazer &lado a lado" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 05070c0058a..36c2eda6b9f 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "&Afișare ferestre deschise" IDS_TRAYWND_UNDO_CASCADE "Anulare cascadă" IDS_TRAYWND_UNDO_TILE "An&ulare aranjare" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index d86f3477ef5..601e5a4ba14 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -219,4 +219,5 @@ BEGIN IDS_RESTORE_ALL "&Показать окна" IDS_TRAYWND_UNDO_CASCADE "&Отменить Каскадом" IDS_TRAYWND_UNDO_TILE "&Отменить Окна рядом" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 7f42ea11589..d314cda1792 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 97634842e87..678e48ebdd7 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -215,4 +215,5 @@ BEGIN IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 1fb336b1118..f67bccb27b3 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -217,4 +217,5 @@ BEGIN IDS_RESTORE_ALL "&Açık Pencereleri Göster" IDS_TRAYWND_UNDO_CASCADE "&Kademeyi Geri Al" IDS_TRAYWND_UNDO_TILE "&Döşemeyi Geri Al" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index 413fa063db6..b007a200ef6 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -219,4 +219,5 @@ BEGIN IDS_RESTORE_ALL "&Показати відкриті вікна" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 3d583aeef99..5de7294948d 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -217,4 +217,5 @@ BEGIN IDS_RESTORE_ALL "显示打开的窗口(&S)" IDS_TRAYWND_UNDO_CASCADE "撤销层叠(&U)" IDS_TRAYWND_UNDO_TILE "撤销平铺(&U)" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/zh-HK.rc b/base/shell/explorer/lang/zh-HK.rc index faec29523d8..67f404d3458 100644 --- a/base/shell/explorer/lang/zh-HK.rc +++ b/base/shell/explorer/lang/zh-HK.rc @@ -216,4 +216,5 @@ BEGIN IDS_RESTORE_ALL "顯示開啟的視窗(&S)" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 5e100da0257..973ab75aaac 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -217,4 +217,5 @@ BEGIN IDS_RESTORE_ALL "顯示開啟的視窗(&S)" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYDESKBTN_TOOLTIP "Show Desktop/Windows" END diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index cd4400a9334..72b3456270b 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -105,6 +105,7 @@ #define IDS_RESTORE_ALL 811 #define IDS_TRAYWND_UNDO_CASCADE 812 #define IDS_TRAYWND_UNDO_TILE 813 +#define IDS_TRAYDESKBTN_TOOLTIP 814 /* These values must be synchronized with shell32 */ #define IDS_ADVANCED_DISPLAY_FAVORITES 30466 diff --git a/base/shell/explorer/traydeskbtn.cpp b/base/shell/explorer/traydeskbtn.cpp index bb448f2495d..009f79c892e 100644 --- a/base/shell/explorer/traydeskbtn.cpp +++ b/base/shell/explorer/traydeskbtn.cpp @@ -76,6 +76,19 @@ HRESULT CTrayShowDesktopButton::DoCreate(HWND hwndParent) m_szIcon.cx = GetSystemMetrics(SM_CXSMICON); m_szIcon.cy = GetSystemMetrics(SM_CYSMICON); + // Create tooltip + m_tooltip.Create(m_hWnd, WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP); + + TOOLINFOW ti = { 0 }; + ti.cbSize = TTTOOLINFOW_V1_SIZE; + ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + ti.hwnd = m_hWnd; + ti.uId = reinterpret_cast<UINT_PTR>(m_hWnd); + ti.hinst = hExplorerInstance; + ti.lpszText = MAKEINTRESOURCEW(IDS_TRAYDESKBTN_TOOLTIP); + + m_tooltip.AddTool(&ti); + // Prep visual style EnsureWindowTheme(TRUE); diff --git a/base/shell/explorer/traydeskbtn.h b/base/shell/explorer/traydeskbtn.h index 5e59ecfa1a6..f779aa11dfa 100644 --- a/base/shell/explorer/traydeskbtn.h +++ b/base/shell/explorer/traydeskbtn.h @@ -28,6 +28,7 @@ class CTrayShowDesktopButton : BOOL m_drawWithDedicatedBackground; BOOL m_bHovering; HWND m_hWndTaskbar; + CTooltips m_tooltip; public: BOOL m_bPressed;

8 months

[reactos] 01/01: [SHELL32] No new menu and working properties in Drives and NetHood background menu (#7430)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cca5bf4b04fc5c7c9012… commit 9cca5bf4b04fc5c7c90129d99780475a53603394 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Oct 31 14:12:34 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 31 14:12:34 2024 +0100 [SHELL32] No new menu and working properties in Drives and NetHood background menu (#7430) - No "New" menu in My Computer background menu. - Add "Properties" in NetHood background menu. --- dll/win32/shell32/folders/CDrivesFolder.cpp | 17 ++-------------- dll/win32/shell32/folders/CNetFolder.cpp | 31 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 83f3d684e98..fd41debc914 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -915,20 +915,7 @@ HRESULT WINAPI CDrivesFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVO } else if (IsEqualIID(riid, IID_IContextMenu)) { - HKEY hKeys[16]; - UINT cKeys = 0; - AddClassKeyToArray(L"Directory\\Background", hKeys, &cKeys); - - DEFCONTEXTMENU dcm; - dcm.hwnd = hwndOwner; - dcm.pcmcb = this; - dcm.pidlFolder = pidlRoot; - dcm.psf = this; - dcm.cidl = 0; - dcm.apidl = NULL; - dcm.cKeys = cKeys; - dcm.aKeys = hKeys; - dcm.punkAssociationInfo = NULL; + DEFCONTEXTMENU dcm = { hwndOwner, this, pidlRoot, this }; hr = SHCreateDefaultContextMenu(&dcm, riid, ppvOut); } else if (IsEqualIID(riid, IID_IShellView)) @@ -1364,7 +1351,7 @@ HRESULT WINAPI CDrivesFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataO // "System" properties return SHELL_ExecuteControlPanelCPL(hwndOwner, L"sysdm.cpl") ? S_OK : E_FAIL; } - else if (uMsg == DFM_MERGECONTEXTMENU) + else if (uMsg == DFM_MERGECONTEXTMENU) // TODO: DFM_MERGECONTEXTMENU_BOTTOM { QCMINFO *pqcminfo = (QCMINFO *)lParam; HMENU hpopup = CreatePopupMenu(); diff --git a/dll/win32/shell32/folders/CNetFolder.cpp b/dll/win32/shell32/folders/CNetFolder.cpp index a96e9e1d493..e557e791dc9 100644 --- a/dll/win32/shell32/folders/CNetFolder.cpp +++ b/dll/win32/shell32/folders/CNetFolder.cpp @@ -207,6 +207,33 @@ BOOL CNetFolderEnum::CreateMyCompEnumList(DWORD dwFlags) return bRet; } +/************************************************************************** + * CNetFolder background context menu + */ +static HRESULT CALLBACK CNetFolderBackgroundMenuCB(IShellFolder *psf, HWND hwnd, IDataObject *pdtobj, + UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + enum { IDC_PROPERTIES }; + if (uMsg == DFM_INVOKECOMMAND && wParam == IDC_PROPERTIES) + { + return SHELL_ExecuteControlPanelCPL(hwnd, L"ncpa.cpl") ? S_OK : E_FAIL; + } + else if (uMsg == DFM_MERGECONTEXTMENU) // TODO: DFM_MERGECONTEXTMENU_BOTTOM + { + QCMINFO *pqcminfo = (QCMINFO*)lParam; + HMENU hpopup = CreatePopupMenu(); + _InsertMenuItemW(hpopup, 0, TRUE, IDC_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED); + pqcminfo->idCmdFirst = Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu, pqcminfo->idCmdFirst, pqcminfo->idCmdLast, MM_ADDSEPARATOR); + DestroyMenu(hpopup); + return S_OK; + } + return SHELL32_DefaultContextMenuCallBack(psf, pdtobj, uMsg); +} + +/************************************************************************** + * CNetFolder + */ + CNetFolder::CNetFolder() { pidlRoot = NULL; @@ -330,8 +357,8 @@ HRESULT WINAPI CNetFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID } else if (IsEqualIID(riid, IID_IContextMenu)) { - WARN("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, 0, NULL, this, CNetFolderBackgroundMenuCB, + 0, NULL, (IContextMenu**)ppvOut); } else if (IsEqualIID(riid, IID_IShellView)) {

8 months

[reactos] 01/01: [SDK:INCLUDE] Add missing msv1_0p.h

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92996dac21d4e15d60824… commit 92996dac21d4e15d6082406c74c818f30fa87586 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 28 11:48:32 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Oct 28 11:48:32 2024 +0100 [SDK:INCLUDE] Add missing msv1_0p.h --- sdk/include/reactos/msv1_0p.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/include/reactos/msv1_0p.h b/sdk/include/reactos/msv1_0p.h new file mode 100644 index 00000000000..674d5f1f5a2 --- /dev/null +++ b/sdk/include/reactos/msv1_0p.h @@ -0,0 +1,17 @@ +#ifndef _MSV1_0P_ +#define _MSV1_0P_ + +typedef struct _MSV1_0_ENUMUSERS_REQUEST +{ + MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType; +} MSV1_0_ENUMUSERS_REQUEST, *PMSV1_0_ENUMUSERS_REQUEST; + +typedef struct _MSV1_0_ENUMUSERS_RESPONSE +{ + MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG NumberOfLoggedOnUsers; + PLUID LogonIds; + PULONG EnumHandles; +} MSV1_0_ENUMUSERS_RESPONSE, *PMSV1_0_ENUMUSERS_RESPONSE; + +#endif /* _MSV1_0P_ */

8 months

[reactos] 01/01: [MSV1_0] Implement the MsV1_0EnumerateUsers message in LsaApCallPackage

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbad45a273b8e5633c6ae… commit dbad45a273b8e5633c6aede9523cd4d22c0d6cd6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 28 11:44:41 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Oct 28 11:45:12 2024 +0100 [MSV1_0] Implement the MsV1_0EnumerateUsers message in LsaApCallPackage --- dll/win32/msv1_0/msv1_0.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/precomp.h | 1 + 2 files changed, 159 insertions(+) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 63aad086fd9..735b4a3e0df 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -12,6 +12,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); +typedef struct _LOGON_LIST_ENTRY +{ + LIST_ENTRY ListEntry; + LUID LogonId; + ULONG EnumHandle; +} LOGON_LIST_ENTRY, *PLOGON_LIST_ENTRY; + +/* GLOBALS *****************************************************************/ + +BOOL PackageInitialized = FALSE; +LIST_ENTRY LogonListHead; +ULONG EnumCounter; /* FUNCTIONS ***************************************************************/ @@ -819,6 +831,125 @@ done: } +static +NTSTATUS +MsvpEnumerateUsers( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferLength, + _Out_ PVOID *ProtocolReturnBuffer, + _Out_ PULONG ReturnBufferLength, + _Out_ PNTSTATUS ProtocolStatus) +{ + PMSV1_0_ENUMUSERS_RESPONSE LocalBuffer = NULL; + PVOID ClientBaseAddress = NULL; + ULONG BufferLength; + PLIST_ENTRY CurrentEntry; + PLOGON_LIST_ENTRY LogonEntry; + ULONG LogonCount = 0; + PLUID LuidPtr; + PULONG EnumPtr; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("MsvpEnumerateUsers()\n"); + + /* Count the currently logged-on users */ + CurrentEntry = LogonListHead.Flink; + while (CurrentEntry != &LogonListHead) + { + LogonEntry = CONTAINING_RECORD(CurrentEntry, + LOGON_LIST_ENTRY, + ListEntry); + + TRACE("Logon %lu: 0x%08lx\n", LogonCount, LogonEntry->LogonId.LowPart); + LogonCount++; + + CurrentEntry = CurrentEntry->Flink; + } + + TRACE("LogonCount %lu\n", LogonCount); + + BufferLength = sizeof(MSV1_0_ENUMUSERS_RESPONSE) + + (LogonCount * sizeof(LUID)) + + (LogonCount * sizeof(ULONG)); + + LocalBuffer = DispatchTable.AllocateLsaHeap(BufferLength); + if (LocalBuffer == NULL) + { + ERR("Failed to allocate the local buffer!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = DispatchTable.AllocateClientBuffer(ClientRequest, + BufferLength, + &ClientBaseAddress); + if (!NT_SUCCESS(Status)) + { + ERR("DispatchTable.AllocateClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + TRACE("ClientBaseAddress: %p\n", ClientBaseAddress); + + /* Fill the local buffer */ + LocalBuffer->MessageType = MsV1_0EnumerateUsers; + LocalBuffer->NumberOfLoggedOnUsers = LogonCount; + + LuidPtr = (PLUID)((ULONG_PTR)LocalBuffer + sizeof(MSV1_0_ENUMUSERS_RESPONSE)); + EnumPtr = (PULONG)((ULONG_PTR)LuidPtr + LogonCount * sizeof(LUID)); + + LocalBuffer->LogonIds = (PLUID)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)LuidPtr - (ULONG_PTR)LocalBuffer); + LocalBuffer->EnumHandles = (PULONG)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)EnumPtr - (ULONG_PTR)LocalBuffer); + + /* Copy the LogonIds and EnumHandles into the local buffer */ + CurrentEntry = LogonListHead.Flink; + while (CurrentEntry != &LogonListHead) + { + LogonEntry = CONTAINING_RECORD(CurrentEntry, + LOGON_LIST_ENTRY, + ListEntry); + + TRACE("Logon: 0x%08lx %lu\n", LogonEntry->LogonId.LowPart, LogonEntry->EnumHandle); + RtlCopyMemory(LuidPtr, &LogonEntry->LogonId, sizeof(LUID)); + LuidPtr++; + + *EnumPtr = LogonEntry->EnumHandle; + EnumPtr++; + + CurrentEntry = CurrentEntry->Flink; + } + + Status = DispatchTable.CopyToClientBuffer(ClientRequest, + BufferLength, + ClientBaseAddress, + LocalBuffer); + if (!NT_SUCCESS(Status)) + { + ERR("DispatchTable.CopyToClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + *ProtocolReturnBuffer = (PMSV1_0_INTERACTIVE_PROFILE)ClientBaseAddress; + *ReturnBufferLength = BufferLength; + *ProtocolStatus = STATUS_SUCCESS; + +done: + if (LocalBuffer != NULL) + DispatchTable.FreeLsaHeap(LocalBuffer); + + if (!NT_SUCCESS(Status)) + { + if (ClientBaseAddress != NULL) + DispatchTable.FreeClientBuffer(ClientRequest, + ClientBaseAddress); + } + + return STATUS_SUCCESS; +} + + /* * @unimplemented */ @@ -853,6 +984,15 @@ LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, break; case MsV1_0EnumerateUsers: + Status = MsvpEnumerateUsers(ClientRequest, + ProtocolSubmitBuffer, + ClientBufferBase, + SubmitBufferLength, + ProtocolReturnBuffer, + ReturnBufferLength, + ProtocolStatus); + break; + case MsV1_0GetUserInfo: case MsV1_0ReLogonUsers: Status = STATUS_INVALID_PARAMETER; @@ -962,6 +1102,13 @@ LsaApInitializePackage(IN ULONG AuthenticationPackageId, AuthenticationPackageId, LsaDispatchTable, Database, Confidentiality, AuthenticationPackageName); + if (!PackageInitialized) + { + InitializeListHead(&LogonListHead); + EnumCounter = 0; + PackageInitialized = TRUE; + } + /* Get the dispatch table entries */ DispatchTable.CreateLogonSession = LsaDispatchTable->CreateLogonSession; DispatchTable.DeleteLogonSession = LsaDispatchTable->DeleteLogonSession; @@ -1134,6 +1281,7 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, BOOL SpecialAccount = FALSE; UCHAR LogonPassHash; PUNICODE_STRING ErasePassword = NULL; + PLOGON_LIST_ENTRY LogonEntry = NULL; TRACE("LsaApLogonUserEx2()\n"); @@ -1329,6 +1477,16 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, SessionCreated = TRUE; + LogonEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGON_LIST_ENTRY)); + if (LogonEntry) + { + RtlCopyMemory(&LogonEntry->LogonId, LogonId, sizeof(LUID)); + LogonEntry->EnumHandle = EnumCounter; + EnumCounter++; + + InsertTailList(&LogonListHead, &LogonEntry->ListEntry); + } + if (LogonType == Interactive || LogonType == Batch || LogonType == Service) { /* Build and fill the interactive profile buffer */ diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index 71b2524844c..a034c3e6100 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -30,6 +30,7 @@ #include <samsrv/samsrv.h> //#include <lsass/lsasrv.h> +#include <msv1_0p.h> #include "ntlm/global.h" #include "ntlm/protocol.h"

8 months

[reactos] 01/01: [NTGDI:FREETYPE] Account for non-breaking spaces in x-dim of IntExtTextOutW (#7479)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bb1e644082b59f0d8d18… commit 3bb1e644082b59f0d8d18dc0cf529cae31e2fb70 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Oct 26 16:44:39 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 26 16:44:39 2024 -0500 [NTGDI:FREETYPE] Account for non-breaking spaces in x-dim of IntExtTextOutW (#7479) CORE-19768 Follow up of PR #7274. This stop WARN's from FF 28 as well. * Make del and nbsp const's based on reviewer comments. --- win32ss/gdi/ntgdi/freetype.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5a6f8479bbc..8deb9e6820b 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -6795,7 +6795,8 @@ IntExtTextOutW( FONT_CACHE_ENTRY Cache; FT_Matrix mat; BOOL bNoTransform; - DWORD ch0, ch1, etx = 3; // etx is ASCII End of Text + DWORD ch0, ch1; + const DWORD del = 0x7f, nbsp = 0xa0; // DEL is ASCII DELETE and nbsp is a non-breaking space FONTLINK_CHAIN Chain; SIZE spaceWidth; @@ -7063,13 +7064,14 @@ IntExtTextOutW( bitSize.cx = realglyph->bitmap.width; bitSize.cy = realglyph->bitmap.rows; - /* Do chars other than space and etx have a bitSize.cx of zero? */ - if (ch0 != L' ' && ch0 != etx && bitSize.cx == 0) + /* Do chars > space & not DEL & not nbsp have a bitSize.cx of zero? */ + if (ch0 > L' ' && ch0 != del && ch0 != nbsp && bitSize.cx == 0) DPRINT1("WARNING: WChar 0x%04x has a bitSize.cx of zero\n", ch0); - /* Don't ignore spaces when computing offset. + /* Don't ignore spaces or non-breaking spaces when computing offset. * This completes the fix of CORE-11787. */ - if ((pdcattr->flTextAlign & TA_UPDATECP) && ch0 == L' ' && bitSize.cx == 0) + if ((pdcattr->flTextAlign & TA_UPDATECP) && bitSize.cx == 0 && + (ch0 == L' ' || ch0 == nbsp)) // Space chars needing x-dim widths { IntUnLockFreeType(); /* Get the width of the space character */

8 months, 1 week

[reactos] 03/03: [PSDK] winbase.h: Add other missing CreateProcess() dwCreationFlags values

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3736938030c97d0ea4d17… commit 3736938030c97d0ea4d1786a13f1406a5f2ca2cf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 25 22:21:45 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 25 22:27:37 2024 +0200 [PSDK] winbase.h: Add other missing CreateProcess() dwCreationFlags values Vista: INHERIT_CALLER_PRIORITY CREATE_PROTECTED_PROCESS EXTENDED_STARTUPINFO_PRESENT PROCESS_MODE_BACKGROUND_BEGIN PROCESS_MODE_BACKGROUND_END Win7: INHERIT_PARENT_AFFINITY Win 10.0.17134.0 (Redstone 4): CREATE_SECURE_PROCESS References: https://abi-laboratory.pro/compatibility/Windows_5.0_to_Windows_6.0/x86_64/… https://abi-laboratory.pro/compatibility/Windows_6.0_to_Windows_7.0/x86_64/… https://github.com/hughbe/windows-sdk-headers --- sdk/include/psdk/winbase.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 88ba3a445ac..918d3e68a21 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -191,6 +191,23 @@ extern "C" { #define CREATE_FORCEDOS 0x00002000 #define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 #define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define INHERIT_PARENT_AFFINITY 0x00010000 +#endif // _WIN32_WINNT_WIN7 + +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +#define INHERIT_CALLER_PRIORITY 0x00020000 // Deprecated +#define CREATE_PROTECTED_PROCESS 0x00040000 +#define EXTENDED_STARTUPINFO_PRESENT 0x00080000 +#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 +#define PROCESS_MODE_BACKGROUND_END 0x00200000 +#endif // _WIN32_WINNT_VISTA + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS4) +#define CREATE_SECURE_PROCESS 0x00400000 +#endif // NTDDI_WIN10_RS4 + #define CREATE_BREAKAWAY_FROM_JOB 0x01000000 #define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 #define CREATE_DEFAULT_ERROR_MODE 0x04000000

8 months, 1 week

[reactos] 02/03: [PSDK] winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a27227b831955dd311bc6… commit a27227b831955dd311bc66cd306d4fdd4398cea5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 25 21:14:14 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 25 21:21:45 2024 +0200 [PSDK] winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT Import Wine commit https://github.com/wine-mirror/wine/commit/e19ad98564295354e36df473c278167b… winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Co-authored-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- sdk/include/psdk/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 495c02c1dc7..88ba3a445ac 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -198,6 +198,7 @@ extern "C" { #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 /* CreateThread()/CreateRemoteThread() dwCreationFlags values */ // #define CREATE_SUSPENDED 0x00000004 // See above

8 months, 1 week

[reactos] 01/03: [PSDK] winbase.h: Isolate the CreateProcess() dwCreationFlag values

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7fa4292ce1e20269469d… commit d7fa4292ce1e20269469de3622061a571992ee69 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 25 21:13:40 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 25 21:21:37 2024 +0200 [PSDK] winbase.h: Isolate the CreateProcess() dwCreationFlag values --- sdk/include/psdk/winbase.h | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 2356d2915d1..495c02c1dc7 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -173,29 +173,36 @@ extern "C" { #define PIPE_CLIENT_END 0 #define PIPE_SERVER_END 1 #define PIPE_UNLIMITED_INSTANCES 255 -#define DEBUG_PROCESS 0x00000001 -#define DEBUG_ONLY_THIS_PROCESS 0x00000002 -#define CREATE_SUSPENDED 0x00000004 -#define DETACHED_PROCESS 0x00000008 -#define CREATE_NEW_CONSOLE 0x00000010 -#define NORMAL_PRIORITY_CLASS 0x00000020 -#define IDLE_PRIORITY_CLASS 0x00000040 -#define HIGH_PRIORITY_CLASS 0x00000080 -#define REALTIME_PRIORITY_CLASS 0x00000100 -#define CREATE_NEW_PROCESS_GROUP 0x00000200 -#define CREATE_UNICODE_ENVIRONMENT 0x00000400 -#define CREATE_SEPARATE_WOW_VDM 0x00000800 -#define CREATE_SHARED_WOW_VDM 0x00001000 -#define CREATE_FORCEDOS 0x00002000 -#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 -#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 -#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 -#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 -#define CREATE_DEFAULT_ERROR_MODE 0x04000000 -#define CREATE_NO_WINDOW 0x08000000 -#define PROFILE_USER 0x10000000 -#define PROFILE_KERNEL 0x20000000 -#define PROFILE_SERVER 0x40000000 + +/* CreateProcess() dwCreationFlags values */ +#define DEBUG_PROCESS 0x00000001 +#define DEBUG_ONLY_THIS_PROCESS 0x00000002 +#define CREATE_SUSPENDED 0x00000004 +#define DETACHED_PROCESS 0x00000008 +#define CREATE_NEW_CONSOLE 0x00000010 +#define NORMAL_PRIORITY_CLASS 0x00000020 +#define IDLE_PRIORITY_CLASS 0x00000040 +#define HIGH_PRIORITY_CLASS 0x00000080 +#define REALTIME_PRIORITY_CLASS 0x00000100 +#define CREATE_NEW_PROCESS_GROUP 0x00000200 +#define CREATE_UNICODE_ENVIRONMENT 0x00000400 +#define CREATE_SEPARATE_WOW_VDM 0x00000800 +#define CREATE_SHARED_WOW_VDM 0x00001000 +#define CREATE_FORCEDOS 0x00002000 +#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 +#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 +#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 +#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 +#define CREATE_DEFAULT_ERROR_MODE 0x04000000 +#define CREATE_NO_WINDOW 0x08000000 +#define PROFILE_USER 0x10000000 +#define PROFILE_KERNEL 0x20000000 +#define PROFILE_SERVER 0x40000000 + +/* CreateThread()/CreateRemoteThread() dwCreationFlags values */ +// #define CREATE_SUSPENDED 0x00000004 // See above +#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 + #define CREATE_NEW 1 #define CREATE_ALWAYS 2 #define OPEN_EXISTING 3 @@ -574,7 +581,6 @@ extern "C" { #define FIBER_FLAG_FLOAT_SWITCH 0x1 #endif #define FLS_OUT_OF_INDEXES 0xFFFFFFFF -#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 #if (_WIN32_WINNT >= 0x0600) #define MAX_RESTART_CMD_LINE 0x800 #define RESTART_CYCLICAL 0x1

8 months, 1 week

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