Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [BOOTDATA] hivesys.inf: Remove redundant fastfat "Start" entry.
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18d40ebe81cbc4646f482… commit 18d40ebe81cbc4646f48247d831bc1d53752dd1b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 17:52:16 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 17:52:35 2022 +0200 [BOOTDATA] hivesys.inf: Remove redundant fastfat "Start" entry. The one in the [AddReg] section has the very same value. --- boot/bootdata/hivesys.inf | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 65c54f7131e..45c3d6e6446 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2232,7 +2232,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\d HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003 [Strings]

1 0

[reactos] 01/02: [OPENGLCFG] Fix encoding of Japanese translation (was using Shift-JIS, now using UTF8).
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=590189793313b3481a4ed… commit 590189793313b3481a4ed83e23606d81b910f361 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 17:40:22 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 17:40:46 2022 +0200 [OPENGLCFG] Fix encoding of Japanese translation (was using Shift-JIS, now using UTF8). Addendum to commit 555bec6a4. --- dll/cpl/openglcfg/lang/ja-JP.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/cpl/openglcfg/lang/ja-JP.rc b/dll/cpl/openglcfg/lang/ja-JP.rc index c4b4d950aa5..88ea40d411c 100644 --- a/dll/cpl/openglcfg/lang/ja-JP.rc +++ b/dll/cpl/openglcfg/lang/ja-JP.rc @@ -2,27 +2,27 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "��ʐݒ�" +CAPTION "一般設定" FONT 9, "MS UI Gothic" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 - GROUPBOX "��_��[�ݒ�", -1, 5, 25, 230, 90 - LTEXT "��_��[(&R):", -1, 15, 42, 37, 10 + GROUPBOX "レンダラー設定", -1, 5, 25, 230, 90 + LTEXT "レンダラー(&R):", -1, 15, 42, 37, 10 COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "��ɂ��A�O��t�B�b�N �h��C�o�[�̃f�t�H��g�ݒ肪�㏑��܂��B�u�f�t�H��g�v��I��ƁA��̐ݒ�ɖ߂�܂��B", -1, 15, 60, 210, 40 - GROUPBOX "�f�o�b�O", -1, 5, 125, 230, 90 + LTEXT "これにより、グラフィックドライバーのデフォルト設定が上書きされます。「デフォルト」を選択すると、元の設定に戻ります。", -1, 15, 60, 210, 40 + GROUPBOX "デバッグ", -1, 5, 125, 230, 90 LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "opengl32 ��̃f�o�b�O�o�͂�L��/��ɂ��܂��B\n\n�x��: �u�ݒ�v�܂��́u�N��A�v��I��ƁADEBUGCHANNEL ��ϐ��̓�e��㏑��܂��B", -1, 15, 165, 210, 40 + LTEXT "opengl32 からのデバッグ出力を有効/無効にします。\n\n警告: 「設定」または「クリア」を選択すると、DEBUGCHANNEL 環境変数の内容が上書きされます。", -1, 15, 165, 210, 40 END STRINGTABLE BEGIN - IDS_RENDERER_DEFAULT "�V�X�e�� f�t�H��g" - IDS_RENDERER_RSWR "ReactOS �\�t�g�E�F�A��" - IDS_CPLNAME "OpenGL �ݒ�" - IDS_CPLDESCRIPTION "OpenGL ��_��[�̐ݒ��ύX��܂�" - IDS_DEBUG_SET "�ݒ�" - IDS_DEBUG_CLEAR "�N��A" - IDS_DEBUG_DNM "�ύX��Ȃ�" + IDS_RENDERER_DEFAULT "システムデフォルト" + IDS_RENDERER_RSWR "ReactOS ソフトウェア実装" + IDS_CPLNAME "OpenGL 設定" + IDS_CPLDESCRIPTION "OpenGL レンダラーの設定を変更します" + IDS_DEBUG_SET "設定" + IDS_DEBUG_CLEAR "クリア" + IDS_DEBUG_DNM "変更しない" END

1 0

[reactos] 01/01: [EXPLORER] Cleanup after last commit (#4722)
by Joachim Henze 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63fa6747827cb72e4ab30… commit 63fa6747827cb72e4ab30345b9a7be11212d6009 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Sep 25 15:48:54 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 25 16:48:54 2022 +0300 [EXPLORER] Cleanup after last commit (#4722) Improves code that was added by 0.4.15-dev-5078-g 46de3a22acc without any review yesterday. CORE-15369 --- base/shell/explorer/traywnd.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2b648e80568..b8437fe23cd 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -3045,10 +3045,8 @@ HandleTrayContextMenu: LRESULT OnNcLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (CheckShowDesktopButtonClick(lParam, bHandled)) - return 0; - - return 0; + CheckShowDesktopButtonClick(lParam, bHandled); + return FALSE; } LRESULT OnAppTrayDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

[reactos] 01/01: [MMSYS] Fix "Speaker settings" image transparency (#4716)
by Thamatip Chitpong 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2b7e5a5628c9c1a34bf… commit 1f2b7e5a5628c9c1a34bfc2dab172f538a5cd9ce Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sun Sep 25 20:46:30 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 25 16:46:30 2022 +0300 [MMSYS] Fix "Speaker settings" image transparency (#4716) - Use 72x72 icon instead of a bitmap - Use correct control position and size for IDC_SPEAKIMG - VolumeDlgProc: Add NULL check for DestroyIcon and fix cleanup order Addendum to 781c247b. --- dll/cpl/mmsys/lang/bg-BG.rc | 2 +- dll/cpl/mmsys/lang/cs-CZ.rc | 2 +- dll/cpl/mmsys/lang/de-DE.rc | 2 +- dll/cpl/mmsys/lang/el-GR.rc | 2 +- dll/cpl/mmsys/lang/en-US.rc | 2 +- dll/cpl/mmsys/lang/es-ES.rc | 2 +- dll/cpl/mmsys/lang/fr-FR.rc | 2 +- dll/cpl/mmsys/lang/he-IL.rc | 2 +- dll/cpl/mmsys/lang/id-ID.rc | 2 +- dll/cpl/mmsys/lang/it-IT.rc | 2 +- dll/cpl/mmsys/lang/ja-JP.rc | 2 +- dll/cpl/mmsys/lang/nl-NL.rc | 2 +- dll/cpl/mmsys/lang/no-NO.rc | 2 +- dll/cpl/mmsys/lang/pl-PL.rc | 2 +- dll/cpl/mmsys/lang/pt-BR.rc | 2 +- dll/cpl/mmsys/lang/pt-PT.rc | 2 +- dll/cpl/mmsys/lang/ro-RO.rc | 2 +- dll/cpl/mmsys/lang/ru-RU.rc | 2 +- dll/cpl/mmsys/lang/sk-SK.rc | 2 +- dll/cpl/mmsys/lang/sq-AL.rc | 2 +- dll/cpl/mmsys/lang/tr-TR.rc | 2 +- dll/cpl/mmsys/lang/uk-UA.rc | 2 +- dll/cpl/mmsys/lang/zh-CN.rc | 2 +- dll/cpl/mmsys/lang/zh-HK.rc | 2 +- dll/cpl/mmsys/lang/zh-TW.rc | 2 +- dll/cpl/mmsys/mmsys.rc | 3 +- dll/cpl/mmsys/resource.h | 2 +- dll/cpl/mmsys/resources/speaker.bmp | Bin 14896 -> 0 bytes dll/cpl/mmsys/resources/speaker.ico | Bin 0 -> 32366 bytes dll/cpl/mmsys/volume.c | 87 ++++++++++++------------------------ 30 files changed, 56 insertions(+), 86 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index 93d04883c84..b9a00488a61 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Поставяне на &значе за звука в задачната лента", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "Разш&ирени...", IDC_ADVANCED_BTN, 154, 105, 80, 15 GROUPBOX "Настройки на говорителя", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Чрез долните настройки можете да укажете силата и други свойства на всеки говорител поотделно.", -1, 70, 155, 150, 36 PUSHBUTTON "Сила на &говорителя...", IDC_SPEAKER_VOL_BTN, 72, 195, 80, 15 PUSHBUTTON "Раз&ширени...", IDC_ADVANCED2_BTN, 154, 195, 80, 15 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index c6e132ace81..4267f92b072 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "Umístit &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Upřesnit...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Nastavení reproduktorů", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Nastavení níže lze použít ke změnění hlasitosti jednotlivých reproduktorů a dalších nastavení.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hlasitost reproduktorů...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "U&přesnit...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 95a2492daac..5de5457beb2 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Lautsprechereinstellungen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Verwenden Sie die unteren Einstellungen um die Lautstärke einzelner Geräte und andere Einstellungen zu verändern.", -1, 70, 155, 150, 36 PUSHBUTTON "&Lautstärke...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "E&rweitert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index 3976d3c4365..0d13de812dc 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index 4f0742b0d26..338eb6a7843 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index 9f93c3cfaec..04f50ba4545 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 30, 92, 180, 10 PUSHBUTTON "Propiedades avan&zadas...", IDC_ADVANCED_BTN, 140, 105, 88, 15 GROUPBOX "Configuración del altavoz ", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Utilice esta configuración para cambiar el volumen del altavoz y otras configuraciones.", -1, 70, 155, 150, 36 PUSHBUTTON "Vol&umen de altavoz...", IDC_SPEAKER_VOL_BTN, 60, 195, 75, 15 PUSHBUTTON "Propiedades &avanzadas...", IDC_ADVANCED2_BTN, 140, 195, 88, 15 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 7180c2a6615..8bdb742709f 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 175, 10 PUSHBUTTON "A&vancé...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Paramètres des enceintes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Utilisez les paramètres ci-dessous pour changer le volume de chaque enceinte et modifier d'autres réglagles.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15 PUSHBUTTON "A&vancé...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index c98f19992e4..0c5b8059048 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -18,7 +18,7 @@ BEGIN AUTOCHECKBOX "שים סמל עוצמה בשורת המשימות", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "מתקדם...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "הגדרות רמקולים", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "עוצמת רמקולים...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "מתקדם...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index 2035718dd68..7737bb9942e 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Tempatkan i&kon volume pada bilah tugas", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Tingkat Lanjut...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Pengaturan pengeras suara", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Gunakan pengaturan di bawah untuk mengubah volume masing-masing pengeras suara dan pengaturan lainnya.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume &Pengeras Suara...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Tingkat La&njut...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index 36e8890675f..fe60d3b85e6 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Avanzate...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Impostazione altoparlanti", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Usare le impostazioni seguenti per modificare per i singoli altoparlanti il volume ed altre impostazioni.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&vanzate...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index 55b6bbea673..a29e91705e7 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "タスクバーに音量アイコンを置く(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "上級者向け(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "スピーカーの設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "個別のスピーカーの音量やその他の設定を変更するために下の設定をお使い下さい。", -1, 70, 155, 150, 36 PUSHBUTTON "スピーカー音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "上級者向け(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index b63fa6cef3f..78c058ff078 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "P&ictogram voor het volume in het systeemvak plaatsen", IDC_ICON_IN_TASKBAR, 25, 92, 190, 10 PUSHBUTTON "Ge&avanceerd...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Luidsprekerinstellingen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Met de onderstaande knoppen kunt u het\nvolume en andere instellingen van de\nluidsprekers wijzigen.", -1, 70, 155, 150, 36 PUSHBUTTON "&Luidsprekervolume..", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "&Geavanceerd...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index 89e32235c9e..b18371eed6c 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Plasser volum &ikon i oppgavelinjen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vansert...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Høytaller innstilling", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Bruk innstillingen under for å endre individuell høytaller volum og andre innstillinger.", -1, 70, 155, 150, 36 PUSHBUTTON "&Høytallervolum...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&vansert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 6b0d0af62e3..478e36848bb 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -30,7 +30,7 @@ BEGIN AUTOCHECKBOX "Umieść &ikonę głośności w zasobniku systemowym", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "&Zaawansowane...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Ustawienia głośników", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Użyj ustawień poniżej aby zmienić indywidualny poziom głośności i dostosować ustawienia zaawansowane.", -1, 70, 155, 150, 36 PUSHBUTTON "&Głośniki...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Z&aawansowane...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index ea0a8781bde..35229b943e7 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/pt-PT.rc b/dll/cpl/mmsys/lang/pt-PT.rc index ef6cb15598b..6e5bc2d1b1e 100644 --- a/dll/cpl/mmsys/lang/pt-PT.rc +++ b/dll/cpl/mmsys/lang/pt-PT.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Colocar um &icone de volume na barra de tarefas", IDC_ICON_IN_TASKBAR, 50, 92, 190, 10 PUSHBUTTON "A&vançadas...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Definições dos altifalantes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Utilize as definições abaixo, para modificar o volume dos altifalantas individualmente e outras definições.", -1, 70, 155, 150, 36 PUSHBUTTON "&Volume dos altifalantes...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15 PUSHBUTTON "Ava&nçadas...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index 3b4de2876d7..5dbf907fd0a 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "Afișează pictogramă în &zona de notificare", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "A&vansate…", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Opțiuni difuzoare", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Folosiți opțiunile de mai jos pentru a ajusta volumul fiecărui difuzor în parte sau pentru alte modificări în configurația difuzoarelor.", -1, 70, 155, 150, 36 PUSHBUTTON "V&olum difuzoare…", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Avansat&e…", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index 504bdeee0a3..16fb46e4152 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -16,7 +16,7 @@ BEGIN AUTOCHECKBOX "Отображать &значок на панели задач", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Дополнительно...", IDC_ADVANCED_BTN, 155, 110, 75, 15 GROUPBOX "Настройки динамиков", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Расположенные ниже кнопки позволяют выполнить индивидуальную настройку громкости динамиков и других параметров.", -1, 70, 155, 150, 36 PUSHBUTTON "Гром&кость...", IDC_SPEAKER_VOL_BTN, 70, 200, 80, 15 PUSHBUTTON "Д&ополнительно...", IDC_ADVANCED2_BTN, 155, 200, 75, 15 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index 34541343e58..56ca747f641 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "Umiestniť &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Spresniť...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Nastavenie reproduktorov", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Tieto možnosti použite na zmenu hlasitosti jednotlivých reproduktorov a iných nastavení.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hlasitosť reproduktorov...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Spr&esniť...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index c32fd998635..ce222aa16ab 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -20,7 +20,7 @@ BEGIN AUTOCHECKBOX "Vendos &ikonen volumit në tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Konfigurimi Boxeve", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Përdor konfigurimet e mëposhtme për të ndryshuar volumin individual to boxeve dhe konfigurimet të tjera.", -1, 70, 155, 150, 36 PUSHBUTTON "&Volumi boxeve...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 33dcf5402df..c862b417c9f 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -18,7 +18,7 @@ BEGIN AUTOCHECKBOX "&Görev çubuğunda ses düzeyi simgesini yerleştir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&elişmiş...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Hoparlör Ayarları", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "Tek hoparlörün, ses düzeyini ve diğer ayarlarını değiştirmek için aşağıdaki ayarları kullanınız.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hoparlör Ses Düzeyi...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Ge&lişmiş...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index 3a646df7a48..5deffb13d41 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -24,7 +24,7 @@ BEGIN AUTOCHECKBOX "Пока&зувати значок гучності на панелі завдань", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Додатково...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Налаштування динаміків", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "За допомогою розташованих нижче кнопок можна виконати індивідуальну настройку гучності динаміків та інших параметрів.", -1, 70, 155, 150, 36 PUSHBUTTON "&Гучність динаміків...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Дод&атково...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index e9c0e9248b1..55d256453a8 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -26,7 +26,7 @@ BEGIN AUTOCHECKBOX "将音量图标放入任务栏(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高级(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "扬声器设置", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "用下列设置更改每个扬声器音量和其他设置。", -1, 70, 155, 150, 36 PUSHBUTTON "扬声器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "高级(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-HK.rc b/dll/cpl/mmsys/lang/zh-HK.rc index 7e92d9c3390..df94ee6d62b 100644 --- a/dll/cpl/mmsys/lang/zh-HK.rc +++ b/dll/cpl/mmsys/lang/zh-HK.rc @@ -24,7 +24,7 @@ BEGIN AUTOCHECKBOX "將音量圖示放入工作列(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "進階(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "揚聲器設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "用下列設定更改每個揚聲器音量和其他設定。", -1, 70, 155, 150, 36 PUSHBUTTON "揚聲器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "進階(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 60995e92ab4..e91c51ef099 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -24,7 +24,7 @@ BEGIN AUTOCHECKBOX "將音量圖示放入工作列(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "進階(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "揚聲器設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45 LTEXT "用下列設定更改每個揚聲器音量和其他設定。", -1, 70, 155, 150, 36 PUSHBUTTON "揚聲器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "進階(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 diff --git a/dll/cpl/mmsys/mmsys.rc b/dll/cpl/mmsys/mmsys.rc index 82e7997848c..83714428136 100644 --- a/dll/cpl/mmsys/mmsys.rc +++ b/dll/cpl/mmsys/mmsys.rc @@ -57,8 +57,7 @@ IDI_SHUTDOWN_ICON ICON "resources/4394.ico" IDI_PLAY_ICON ICON "resources/play.ico" IDI_STOP_ICON ICON "resources/stop.ico" -/* Bitmaps */ -IDB_SPEAKIMG BITMAP "resources/speaker.bmp" +IDI_SPEAKIMG ICON "resources/speaker.ico" #include <reactos/manifest_hosted.rc> diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h index bdd843f65c4..8c7a3d919ce 100644 --- a/dll/cpl/mmsys/resource.h +++ b/dll/cpl/mmsys/resource.h @@ -66,7 +66,7 @@ #define IDC_SAVEAS_BTN 5033 #define IDC_DELETE_BTN 5034 -#define IDB_SPEAKIMG 4624 +#define IDI_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 #define IDC_MUTE_ICON 4626 diff --git a/dll/cpl/mmsys/resources/speaker.bmp b/dll/cpl/mmsys/resources/speaker.bmp deleted file mode 100644 index 98ed0f06584..00000000000 Binary files a/dll/cpl/mmsys/resources/speaker.bmp and /dev/null differ diff --git a/dll/cpl/mmsys/resources/speaker.ico b/dll/cpl/mmsys/resources/speaker.ico new file mode 100644 index 00000000000..548e5d1d44f Binary files /dev/null and b/dll/cpl/mmsys/resources/speaker.ico differ diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index f18a9f57b7e..7f4040fcf8b 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -12,20 +12,13 @@ #include <shellapi.h> -typedef struct _IMGINFO -{ - HBITMAP hBitmap; - INT cxSource; - INT cySource; -} IMGINFO, *PIMGINFO; - - typedef struct _GLOBAL_DATA { HMIXER hMixer; HICON hIconMuted; HICON hIconUnMuted; HICON hIconNoHW; + HICON hIconSpeakImg; LONG muteVal; DWORD muteControlID; @@ -44,30 +37,6 @@ typedef struct _GLOBAL_DATA } GLOBAL_DATA, *PGLOBAL_DATA; -static VOID -InitImageInfo(PIMGINFO ImgInfo) -{ - BITMAP bitmap; - - ZeroMemory(ImgInfo, sizeof(*ImgInfo)); - - ImgInfo->hBitmap = LoadImageW(hApplet, - MAKEINTRESOURCEW(IDB_SPEAKIMG), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - - if (ImgInfo->hBitmap != NULL) - { - GetObjectW(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); - - ImgInfo->cxSource = bitmap.bmWidth; - ImgInfo->cySource = bitmap.bmHeight; - } -} - - VOID GetMuteControl(PGLOBAL_DATA pGlobalData) { @@ -421,7 +390,7 @@ VolumeDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - static IMGINFO ImgInfo; + static const INT speakImgSize[] = {72, 72}; PGLOBAL_DATA pGlobalData; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtrW(hwndDlg, DWLP_USER); @@ -457,8 +426,13 @@ VolumeDlgProc(HWND hwndDlg, pGlobalData->hIconUnMuted = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconMuted = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconNoHW = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NO_HW), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + pGlobalData->hIconSpeakImg = LoadImageW(hApplet, + MAKEINTRESOURCEW(IDI_SPEAKIMG), + IMAGE_ICON, + speakImgSize[0], + speakImgSize[1], + LR_DEFAULTCOLOR); - InitImageInfo(&ImgInfo); InitVolumeControls(hwndDlg, pGlobalData); break; } @@ -469,27 +443,20 @@ VolumeDlgProc(HWND hwndDlg, lpDrawItem = (LPDRAWITEMSTRUCT)lParam; if (lpDrawItem->CtlID == IDC_SPEAKIMG) { - HDC hdcMem; LONG left; /* Position image in centre of dialog */ - left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; + left = (lpDrawItem->rcItem.right - speakImgSize[0]) / 2; - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - if (hdcMem != NULL) - { - SelectObject(hdcMem, ImgInfo.hBitmap); - BitBlt(lpDrawItem->hDC, + DrawIconEx(lpDrawItem->hDC, left, lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, - 0, + pGlobalData->hIconSpeakImg, + speakImgSize[0], + speakImgSize[1], 0, - SRCCOPY); - DeleteDC(hdcMem); - } + NULL, + DI_NORMAL); } break; } @@ -559,19 +526,23 @@ VolumeDlgProc(HWND hwndDlg, case WM_DESTROY: if (pGlobalData) { - if (pGlobalData->volumeCurrentValues) - HeapFree(GetProcessHeap(), 0, pGlobalData->volumeCurrentValues); + HeapFree(GetProcessHeap(), 0, pGlobalData->volumeCurrentValues); + HeapFree(GetProcessHeap(), 0, pGlobalData->volumePreviousValues); + HeapFree(GetProcessHeap(), 0, pGlobalData->volumeInitialValues); + mixerClose(pGlobalData->hMixer); - if (pGlobalData->volumePreviousValues) - HeapFree(GetProcessHeap(), 0, pGlobalData->volumePreviousValues); + if (pGlobalData->hIconSpeakImg) + DestroyIcon(pGlobalData->hIconSpeakImg); - if (pGlobalData->volumeInitialValues) - HeapFree(GetProcessHeap(), 0, pGlobalData->volumeInitialValues); + if (pGlobalData->hIconNoHW) + DestroyIcon(pGlobalData->hIconNoHW); + + if (pGlobalData->hIconMuted) + DestroyIcon(pGlobalData->hIconMuted); + + if (pGlobalData->hIconUnMuted) + DestroyIcon(pGlobalData->hIconUnMuted); - mixerClose(pGlobalData->hMixer); - DestroyIcon(pGlobalData->hIconMuted); - DestroyIcon(pGlobalData->hIconUnMuted); - DestroyIcon(pGlobalData->hIconNoHW); HeapFree(GetProcessHeap(), 0, pGlobalData); } break;

1 0

[reactos] 01/01: [DEVMGR] Update Romanian (ro-RO) translation (#4699)
by Andrei Miloiu 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be04c6358a9ddf3e9c6a1… commit be04c6358a9ddf3e9c6a169b80ed20e6b7aaa0c7 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Sep 25 11:44:41 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 25 11:44:41 2022 +0300 [DEVMGR] Update Romanian (ro-RO) translation (#4699) Reviewed-by: Ștefan Fulea <stefan.fulea(a)mail.com> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/devmgr/lang/ro-RO.rc | 62 ++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index 5389885daba..22af2d2e240 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -1,6 +1,10 @@ /* - * Translators: Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Device Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -19,17 +23,17 @@ BEGIN IDS_ENABLEDEVICE "Folosește acest dispozitiv (activare)" IDS_DISABLEDEVICE "Nu folosi acest dispozitiv (dezactivare)" IDS_UNKNOWNDEVICE "Dispozitiv necunoscut" - IDS_NODRIVERLOADED "Pentru acest dispozitiv nu sunt instalate modúle-pilot." + IDS_NODRIVERLOADED "Pentru acest dispozitiv nu sunt instalate module-pilot." IDS_DEVONPARENT "pe %1" IDS_TROUBLESHOOTDEV "&Depanare…" IDS_ENABLEDEV "A&ctivare" IDS_REINSTALLDRV "Reinstalea&ză modulul-pilot" IDS_PROPERTIES "P&roprietăți" - IDS_UPDATEDRV "A&ctualizare modúl-pilot…" + IDS_UPDATEDRV "A&ctualizare modul-pilot…" IDS_REBOOT "Repornire &calculator…" IDS_NOTAVAILABLE "Indisponibil" IDS_NOTDIGITALLYSIGNED "Nesemnat digital" - IDS_NODRIVERS "Fie nu sunt necesare modúle-pilot, fie nu a fost încărcat niciunul." + IDS_NODRIVERS "Fie nu sunt necesare module-pilot, fie nu a fost încărcat niciunul." IDS_RESOURCE_COLUMN "Tip de resursă" IDS_SETTING_COLUMN "Configurație" IDS_RESOURCE_MEMORY_RANGE "Domeniu de memorie" @@ -52,7 +56,7 @@ BEGIN IDS_DEV_FAILED_FILTER "Modulele-pilot pentru acest dispozitiv necesită reinstalare." IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu funcționează corect deoarece nu poate fi pornit mecanismul (ce conține fișierul %1) necesar pentru încărcarea modulelor-pilot." IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu funcționează corect deoare fișierul %1 care încarcă modulele-pilot pentru acest dispozitiv, este deteriorat." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Defecțiune dispozitiv: Încercați alte modúle-pilot pentru acest dispozitiv. Dacă problema persistă, consultați documentația din dotare." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Defecțiune dispozitiv: Încercați alte module-pilot pentru acest dispozitiv. Dacă problema persistă, consultați documentația din dotare." IDS_DEV_INVALID_DATA "Acest dispozitiv nu funcționează corect, deoarece BIOS din calculator nu raportează corect resursele dispozitivului." IDS_DEV_INVALID_DATA2 "Acest dispozitiv nu funcționează corect, deoarece BIOS din dispozitiv nu raportează corect resursele dispozitivului. " IDS_DEV_FAILED_START "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate modulele-pilot." @@ -165,18 +169,18 @@ END IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Modúle-pilot" +CAPTION "Module-pilot" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Furnizor:", -1, 37, 39, 60, 8, SS_NOPREFIX + LTEXT "Furnizor:", -1, 15, 39, 81, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Dată:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Dată:", -1, 15, 53, 80, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Versiune:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Versiunea modulului-pilot:", -1, 15, 67, 82, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Semnatar digital:", -1, 37, 81, 60, 8, SS_NOPREFIX + LTEXT "Semnatar digital:", -1, 15, 81, 81, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalii…", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Mai multe detalii despre modulele-pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX @@ -185,12 +189,12 @@ BEGIN PUSHBUTTON "&Restabilește", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 LTEXT "Dacă dispozitivul manifestă disfuncții după actualizarea modulului-pilot, restabiliți o versiune precedentă.", -1, 91, 162, 154, 25, SS_NOPREFIX PUSHBUTTON "De&zinstalează", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 - LTEXT "Pentru a dezinstala un modúl-pilot (opțiuni avansate).", -1, 91, 194, 154, 17, SS_NOPREFIX + LTEXT "Pentru a dezinstala un modul-pilot (opțiuni avansate).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Detalii modúl-pilot" +CAPTION "Detaliile modulului-pilot" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -199,14 +203,14 @@ BEGIN CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 - LTEXT "Furnizor:", -1, 14, 134, 50, 8 - EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Versiune fișier:", -1, 14, 150, 50, 8 - EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Drept de autor:", -1, 14, 166, 50, 8 - EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Semnatar digital:", -1, 14, 182, 50, 8 - EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Furnizor:", -1, 10, 134, 63, 8 + EDITTEXT IDC_FILEPROVIDER, 74, 134, 147, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Versiunea fișierului:", -1, 10, 150, 63, 8 + EDITTEXT IDC_FILEVERSION, 74, 150, 147, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Drept de autor:", -1, 10, 166, 63, 8 + EDITTEXT IDC_FILECOPYRIGHT, 74, 166, 147, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Semnatar digital:", -1, 10, 182, 63, 8 + EDITTEXT IDC_DIGITALSIGNER, 74, 182, 147, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "Î&nchide", IDOK, 167, 208, 50, 14 END @@ -247,14 +251,14 @@ END IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Confirm Device Removal" +CAPTION "Confirmați eliminarea dispozitivului" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX - LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 - DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 + LTEXT "Avertisment: Urmează să dezinstalați acest dispozitiv din sistemul dvs.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "Confirmă", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Anulează", IDCANCEL, 166, 100, 50, 14 END @@ -298,7 +302,7 @@ BEGIN END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_UPDATE "Actualizare modúl-pilot…" + IDS_MENU_UPDATE "Actualizare modul-pilot…" IDS_MENU_ENABLE "Activează" IDS_MENU_DISABLE "Dezactivează" IDS_MENU_UNINSTALL "Dezinstalează" @@ -313,7 +317,7 @@ BEGIN IDS_TOOLTIP_SCAN "Scanează configurația fizică" IDS_TOOLTIP_ENABLE "Activează" IDS_TOOLTIP_DISABLE "Dezactivează" - IDS_TOOLTIP_UPDATE "Actualizează modúl-pilot…" + IDS_TOOLTIP_UPDATE "Actualizare modul-pilot…" IDS_TOOLTIP_UNINSTALL "Dezinstalează" END @@ -321,12 +325,12 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Inspectare proprietăți pentru selecția curentă." + IDS_HINT_PROPERTIES " Inspectarea proprietăților pentru selecția curentă." IDS_HINT_SCAN " Scanare pentru depistarea schimbărilor în configurația sistemului." IDS_HINT_ENABLE " Activare dispozitiv selectat." IDS_HINT_DISABLE " Dezactivare dispozitiv selectat." IDS_HINT_UPDATE " Lansare asistent de actualizare a modulului-pilot pentru dispozitivul selestat." - IDS_HINT_UNINSTALL " Dezinstalare modúl-pilot pentru dispozitivul selectat." + IDS_HINT_UNINSTALL " Dezinstalare modul-pilot pentru dispozitivul selectat." IDS_HINT_ADD " Adăugare dispozitiv non-PNP în calculator." IDS_HINT_ABOUT " Despre Gestionarul de dispozitive." IDS_HINT_EXIT " Ieșire din program."

1 0

[reactos] 01/01: [FREELDR] Allow to boot from FATX volume using vfatfs driver
by Stanislav Motylkov 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=328cc411920816e5c1de5… commit 328cc411920816e5c1de5f12dc818fecbdb2767e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 24 16:52:14 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 24 23:56:10 2022 +0300 [FREELDR] Allow to boot from FATX volume using vfatfs driver Also copy vfatfs.sys to disk in 1st stage setup. CORE-16216 CORE-16329 CORE-16373 --- boot/bootdata/txtsetup.sif | 1 + boot/freeldr/freeldr/lib/fs/fat.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 9b7e35d025e..96c55492e38 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -124,6 +124,7 @@ pci.sys = 1,,,,,,x,4,,,,1,4 scsiport.sys = 1,,,,,,,4,,,,1,4 storport.sys = 1,,,,,,,4,,,,1,4 fastfat.sys = 1,,,,,,x,4,,,,1,4 +vfatfs.sys = 1,,,,,,,4,,,,1,4 btrfs.sys = 1,,,,,,x,4,,,,1,4 ramdisk.sys = 1,,,,,,x,4,,,,1,4 pciide.sys = 1,,,,,,,4,,,,1,4 diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index bcbc26123a6..a7495f17770 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1547,6 +1547,16 @@ const DEVVTBL FatFuncTable = L"fastfat", }; +const DEVVTBL FatXFuncTable = +{ + FatClose, + FatGetFileInformation, + FatOpen, + FatRead, + FatSeek, + L"vfatfs", +}; + const DEVVTBL* FatMount(ULONG DeviceId) { PFAT_VOLUME_INFO Volume; @@ -1634,5 +1644,5 @@ const DEVVTBL* FatMount(ULONG DeviceId) // Return success // TRACE("FatMount(%lu) success\n", DeviceId); - return &FatFuncTable; + return (ISFATX(Volume->FatType) ? &FatXFuncTable : &FatFuncTable); }

1 0

[reactos] 01/01: [FS_REC][VFATFS] Update headers per our current coding style
by Stanislav Motylkov 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=542e9f2ba0ad2b1ffabcd… commit 542e9f2ba0ad2b1ffabcdeef638e7b4dacfdd180 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 24 16:24:08 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 24 16:24:08 2022 +0300 [FS_REC][VFATFS] Update headers per our current coding style No code changes. Addendum to 14c39362 and 6d65da93. --- drivers/filesystems/fs_rec/fatx.c | 2 +- drivers/filesystems/vfatfs/CMakeLists.txt | 4 ++-- drivers/filesystems/vfatfs/blockdev.c | 10 ++++------ drivers/filesystems/vfatfs/cleanup.c | 11 +++++------ drivers/filesystems/vfatfs/close.c | 11 +++++------ drivers/filesystems/vfatfs/create.c | 28 +++++----------------------- drivers/filesystems/vfatfs/dir.c | 15 +++++++-------- drivers/filesystems/vfatfs/direntry.c | 13 ++++++------- drivers/filesystems/vfatfs/dirwr.c | 14 ++++++-------- drivers/filesystems/vfatfs/ea.c | 26 ++++---------------------- drivers/filesystems/vfatfs/fastio.c | 11 +++++------ drivers/filesystems/vfatfs/fat.c | 12 +++++------- drivers/filesystems/vfatfs/fcb.c | 17 ++++++++--------- drivers/filesystems/vfatfs/finfo.c | 14 ++++++-------- drivers/filesystems/vfatfs/flush.c | 10 +++++----- drivers/filesystems/vfatfs/fsctl.c | 27 +++++---------------------- drivers/filesystems/vfatfs/iface.c | 28 +++++----------------------- drivers/filesystems/vfatfs/kdbg.c | 11 +++++------ drivers/filesystems/vfatfs/misc.c | 11 +++++------ drivers/filesystems/vfatfs/pnp.c | 10 ++++------ drivers/filesystems/vfatfs/rw.c | 12 +++++------- drivers/filesystems/vfatfs/shutdown.c | 9 ++++----- drivers/filesystems/vfatfs/string.c | 12 +++++------- drivers/filesystems/vfatfs/volume.c | 11 +++++------ 24 files changed, 117 insertions(+), 212 deletions(-) diff --git a/drivers/filesystems/fs_rec/fatx.c b/drivers/filesystems/fs_rec/fatx.c index 165cac292e1..86cce338c8e 100644 --- a/drivers/filesystems/fs_rec/fatx.c +++ b/drivers/filesystems/fs_rec/fatx.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS File System Recognizer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: FATX Recognizer - * COPYRIGHT: Copyright 2022 Hervé Poussineau + * COPYRIGHT: Copyright 2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/CMakeLists.txt b/drivers/filesystems/vfatfs/CMakeLists.txt index 7e0c7d56ee4..cc577e84369 100644 --- a/drivers/filesystems/vfatfs/CMakeLists.txt +++ b/drivers/filesystems/vfatfs/CMakeLists.txt @@ -33,6 +33,6 @@ target_link_libraries(vfatfs ${PSEH_LIB}) add_importlibs(vfatfs ntoskrnl hal) add_pch(vfatfs vfat.h SOURCE) if(SARCH STREQUAL "xbox") - add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) - add_registry_inf(vfatfs_reg.inf) + add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) + add_registry_inf(vfatfs_reg.inf) endif() diff --git a/drivers/filesystems/vfatfs/blockdev.c b/drivers/filesystems/vfatfs/blockdev.c index 33bbb0b16ea..451861e4d65 100644 --- a/drivers/filesystems/vfatfs/blockdev.c +++ b/drivers/filesystems/vfatfs/blockdev.c @@ -1,10 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/blockdev.c - * PURPOSE: Temporary sector reading support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Temporary sector reading support + * COPYRIGHT: Copyright 1999-2001 David Welch <welch(a)cwcom.net> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/cleanup.c b/drivers/filesystems/vfatfs/cleanup.c index ad5f120d914..3844c6f5f0c 100644 --- a/drivers/filesystems/vfatfs/cleanup.c +++ b/drivers/filesystems/vfatfs/cleanup.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/cleanup.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Cleanup routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/close.c b/drivers/filesystems/vfatfs/close.c index aa19c1ed505..e3419632c56 100644 --- a/drivers/filesystems/vfatfs/close.c +++ b/drivers/filesystems/vfatfs/close.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/close.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File close routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/create.c b/drivers/filesystems/vfatfs/create.c index 32c39f11361..3cd0c3c8ea2 100644 --- a/drivers/filesystems/vfatfs/create.c +++ b/drivers/filesystems/vfatfs/create.c @@ -1,27 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/create.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File creation routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2010-2019 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/dir.c b/drivers/filesystems/vfatfs/dir.c index 6f82f65c93d..f943f5f7837 100644 --- a/drivers/filesystems/vfatfs/dir.c +++ b/drivers/filesystems/vfatfs/dir.c @@ -1,12 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/dir.c - * PURPOSE: VFAT Filesystem : directory control - * UPDATE HISTORY: - 19-12-1998 : created - -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Directory control + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2004-2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2012-2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/direntry.c b/drivers/filesystems/vfatfs/direntry.c index 8b5f8757319..91d115c1eb0 100644 --- a/drivers/filesystems/vfatfs/direntry.c +++ b/drivers/filesystems/vfatfs/direntry.c @@ -1,11 +1,10 @@ /* - * FILE: DirEntry.c - * PURPOSE: Routines to manipulate directory entries. - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Rex Jolliff (rex(a)lvcablemodem.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Routines to manipulate directory entries + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2004-2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/dirwr.c b/drivers/filesystems/vfatfs/dirwr.c index 99d4f8946a0..3de2d6d3fd9 100644 --- a/drivers/filesystems/vfatfs/dirwr.c +++ b/drivers/filesystems/vfatfs/dirwr.c @@ -1,12 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/dirwr.c - * PURPOSE: VFAT Filesystem : write in directory - * PROGRAMMER: Rex Jolliff (rex(a)lvcablemodem.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Write in directory + * COPYRIGHT: Copyright 1999-2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2004-2008 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2010-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/ea.c b/drivers/filesystems/vfatfs/ea.c index d2b92a49a6a..8db876fb2fd 100644 --- a/drivers/filesystems/vfatfs/ea.c +++ b/drivers/filesystems/vfatfs/ea.c @@ -1,26 +1,8 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/ea.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Extended attributes handlers + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fastio.c b/drivers/filesystems/vfatfs/fastio.c index 5db742b3a7c..519a9e1b923 100644 --- a/drivers/filesystems/vfatfs/fastio.c +++ b/drivers/filesystems/vfatfs/fastio.c @@ -1,10 +1,9 @@ /* - * FILE: drivers/filesystems/vfatfs/fastio.c - * PURPOSE: Fast IO routines. - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Fast IO routines + * COPYRIGHT: Copyright 2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ #include "vfat.h" diff --git a/drivers/filesystems/vfatfs/fat.c b/drivers/filesystems/vfatfs/fat.c index e32f279991f..186c5d1c361 100644 --- a/drivers/filesystems/vfatfs/fat.c +++ b/drivers/filesystems/vfatfs/fat.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/fat.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File Allocation Table routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fcb.c b/drivers/filesystems/vfatfs/fcb.c index 696184ec627..7fd1789b60e 100644 --- a/drivers/filesystems/vfatfs/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -1,13 +1,12 @@ /* -* FILE: drivers/filesystems/vfatfs/fcb.c -* PURPOSE: Routines to manipulate FCBs. -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) -* Rex Jolliff (rex(a)lvcablemodem.com) -* Herve Poussineau (reactos(a)poussine.freesurf.fr) -* Pierre Schweitzer (pierre(a)reactos.org) -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Routines to manipulate FCBs + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2005-2022 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/finfo.c b/drivers/filesystems/vfatfs/finfo.c index a4ddc72f6bb..906ca4e361b 100644 --- a/drivers/filesystems/vfatfs/finfo.c +++ b/drivers/filesystems/vfatfs/finfo.c @@ -1,12 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/finfo.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File information routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/flush.c b/drivers/filesystems/vfatfs/flush.c index 2861998420b..2f9aadbba8d 100644 --- a/drivers/filesystems/vfatfs/flush.c +++ b/drivers/filesystems/vfatfs/flush.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/flush.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Flushing routines + * COPYRIGHT: Copyright 2004-2013 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fsctl.c b/drivers/filesystems/vfatfs/fsctl.c index 9b4018097d6..84d9b6aec5c 100644 --- a/drivers/filesystems/vfatfs/fsctl.c +++ b/drivers/filesystems/vfatfs/fsctl.c @@ -1,26 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/fsctl.c - * PURPOSE: VFAT Filesystem + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Filesystem routines + * COPYRIGHT: Copyright 2002-2013 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/iface.c b/drivers/filesystems/vfatfs/iface.c index 6ed08d0ab1f..234dbc008f5 100644 --- a/drivers/filesystems/vfatfs/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -1,27 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/iface.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Driver entry interface + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2010-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/kdbg.c b/drivers/filesystems/vfatfs/kdbg.c index 3582c7dcdae..2a03b75120f 100644 --- a/drivers/filesystems/vfatfs/kdbg.c +++ b/drivers/filesystems/vfatfs/kdbg.c @@ -1,10 +1,9 @@ /* -* FILE: drivers/filesystems/vfatfs/kdbg.c -* PURPOSE: KDBG extension. -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: KDBG extension + * COPYRIGHT: Copyright 2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/misc.c b/drivers/filesystems/vfatfs/misc.c index 127851ba9bf..35c66e23440 100644 --- a/drivers/filesystems/vfatfs/misc.c +++ b/drivers/filesystems/vfatfs/misc.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/misc.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Misc routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/pnp.c b/drivers/filesystems/vfatfs/pnp.c index 6a07e7e90a2..ea788149dec 100644 --- a/drivers/filesystems/vfatfs/pnp.c +++ b/drivers/filesystems/vfatfs/pnp.c @@ -1,10 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/pnp.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Pierre Schweitzer - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Plug & Play handlers + * COPYRIGHT: Copyright 2010-2015 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/rw.c b/drivers/filesystems/vfatfs/rw.c index 66caebdc850..709b199e824 100644 --- a/drivers/filesystems/vfatfs/rw.c +++ b/drivers/filesystems/vfatfs/rw.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/rw.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Reading and writing routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/shutdown.c b/drivers/filesystems/vfatfs/shutdown.c index 8e367453357..db047b87366 100644 --- a/drivers/filesystems/vfatfs/shutdown.c +++ b/drivers/filesystems/vfatfs/shutdown.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/shutdown.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Eric Kohl + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Shutdown handlers + * COPYRIGHT: Copyright 2000-2013 Eric Kohl <eric.kohl(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/string.c b/drivers/filesystems/vfatfs/string.c index 00b3271c921..a824a39f526 100644 --- a/drivers/filesystems/vfatfs/string.c +++ b/drivers/filesystems/vfatfs/string.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/string.c - * PURPOSE: VFAT Filesystem - * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) - * Doug Lyons (douglyons at douglyons dot com) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Volume routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2020 Doug Lyons <douglyons(a)douglyons.com> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/volume.c b/drivers/filesystems/vfatfs/volume.c index d1f10d05646..d3fb63d5933 100644 --- a/drivers/filesystems/vfatfs/volume.c +++ b/drivers/filesystems/vfatfs/volume.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/volume.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Volume routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2004-2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES *****************************************************************/

1 0

[reactos] 06/06: [FS_REC] Add FATX recognizer
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d65da93e3c5d9c934dc5… commit 6d65da93e3c5d9c934dc5d4ae03b95d7609b2198 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:46:04 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [FS_REC] Add FATX recognizer CORE-16373 --- drivers/filesystems/fs_rec/CMakeLists.txt | 1 + drivers/filesystems/fs_rec/fatx.c | 130 ++++++++++++++++++++++++++++++ drivers/filesystems/fs_rec/fs_rec.c | 17 ++++ drivers/filesystems/fs_rec/fs_rec.h | 8 ++ 4 files changed, 156 insertions(+) diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt index 2d309ef7447..c231d3d378d 100644 --- a/drivers/filesystems/fs_rec/CMakeLists.txt +++ b/drivers/filesystems/fs_rec/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE cdfs.c ext2.c fat.c + fatx.c ffs.c fs_rec.c ntfs.c diff --git a/drivers/filesystems/fs_rec/fatx.c b/drivers/filesystems/fs_rec/fatx.c new file mode 100644 index 00000000000..165cac292e1 --- /dev/null +++ b/drivers/filesystems/fs_rec/fatx.c @@ -0,0 +1,130 @@ +/* + * PROJECT: ReactOS File System Recognizer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: FATX Recognizer + * COPYRIGHT: Copyright 2022 Hervé Poussineau + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" + +#define NDEBUG +#include <debug.h> + +/* TYPES ****************************************************************/ + +#include <pshpack1.h> +typedef struct _FATX_BOOT_SECTOR +{ + UCHAR SysType[4]; + ULONG VolumeId; + ULONG SectorsPerCluster; + USHORT FatCount; + ULONG Reserved; + UCHAR Unused[4078]; +} FATX_BOOT_SECTOR, *PFATX_BOOT_SECTOR; +#include <poppack.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsFatxVolume(IN PFATX_BOOT_SECTOR BootSector) +{ + BOOLEAN Result = TRUE; + + PAGED_CODE(); + + if (BootSector->SysType[0] != 'F' || + BootSector->SysType[1] != 'A' || + BootSector->SysType[2] != 'T' || + BootSector->SysType[3] != 'X') + { + /* Fail */ + Result = FALSE; + } + else if (BootSector->SectorsPerCluster != 1 && + BootSector->SectorsPerCluster != 2 && + BootSector->SectorsPerCluster != 4 && + BootSector->SectorsPerCluster != 8 && + BootSector->SectorsPerCluster != 16 && + BootSector->SectorsPerCluster != 32 && + BootSector->SectorsPerCluster != 64 && + BootSector->SectorsPerCluster != 128) + { + /* Fail */ + Result = FALSE; + } + + /* Return the result */ + return Result; +} + +NTSTATUS +NTAPI +FsRecFatxFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PFATX_BOOT_SECTOR Bpb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset = {{0, 0}}; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the BPB */ + if (FsRecReadBlock(MountDevice, + &Offset, + 512, + SectorSize, + (PVOID)&Bpb, + &DeviceError)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsFatxVolume(Bpb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Bpb); + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\vfatfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} + +/* EOF */ diff --git a/drivers/filesystems/fs_rec/fs_rec.c b/drivers/filesystems/fs_rec/fs_rec.c index e350fac5ceb..1dd5b4d2697 100644 --- a/drivers/filesystems/fs_rec/fs_rec.c +++ b/drivers/filesystems/fs_rec/fs_rec.c @@ -182,6 +182,12 @@ FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, Status = FsRecFfsFsControl(DeviceObject, Irp); break; + case FS_TYPE_FATX: + + /* Send FATX command */ + Status = FsRecFatxFsControl(DeviceObject, Irp); + break; + default: /* Unrecognized FS */ @@ -468,6 +474,17 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register FATX */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\FatX", + L"\\FileSystem\\FatXRecognizer", + FS_TYPE_FATX, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0); + if (NT_SUCCESS(Status)) DeviceCount++; + /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } diff --git a/drivers/filesystems/fs_rec/fs_rec.h b/drivers/filesystems/fs_rec/fs_rec.h index 4e062e2ff4b..fe56d1ac18f 100644 --- a/drivers/filesystems/fs_rec/fs_rec.h +++ b/drivers/filesystems/fs_rec/fs_rec.h @@ -177,6 +177,7 @@ typedef enum _FILE_SYSTEM_TYPE FS_TYPE_BTRFS, FS_TYPE_REISERFS, FS_TYPE_FFS, + FS_TYPE_FATX, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -252,6 +253,13 @@ FsRecFfsFsControl( IN PIRP Irp ); +NTSTATUS +NTAPI +FsRecFatxFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + BOOLEAN NTAPI FsRecGetDeviceSectors(

1 0

[reactos] 05/06: [VFATFS] Correctly init dirIndex/startIndex on FATX subdirectories
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa809fd2feb93d4d65cc9… commit fa809fd2feb93d4d65cc94436bdd5024bc8be667 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:32:01 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Correctly init dirIndex/startIndex on FATX subdirectories '.' and '..' entries do not exist on FATX subdirectories. We have to fake them when enumerating the directory, and ignore them when creating a FCB from a directory entry. CORE-16373 --- drivers/filesystems/vfatfs/fcb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/vfatfs/fcb.c b/drivers/filesystems/vfatfs/fcb.c index 6fd76071678..696184ec627 100644 --- a/drivers/filesystems/vfatfs/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -428,6 +428,7 @@ static VOID vfatInitFCBFromDirEntry( PDEVICE_EXTENSION Vcb, + PVFATFCB ParentFcb, PVFATFCB Fcb, PVFAT_DIRENTRY_CONTEXT DirContext) { @@ -476,7 +477,8 @@ vfatInitFCBFromDirEntry( } Fcb->dirIndex = DirContext->DirIndex; Fcb->startIndex = DirContext->StartIndex; - if (vfatVolumeIsFatX(Vcb) && !vfatFCBIsRoot(Fcb)) + Fcb->parentFcb = ParentFcb; + if (vfatVolumeIsFatX(Vcb) && !vfatFCBIsRoot(ParentFcb)) { ASSERT(DirContext->DirIndex >= 2 && DirContext->StartIndex >= 2); Fcb->dirIndex = DirContext->DirIndex-2; @@ -572,13 +574,12 @@ vfatUpdateFCB( RemoveEntryList(&Fcb->ParentListEntry); /* Reinit FCB */ - vfatInitFCBFromDirEntry(pVCB, Fcb, DirContext); + vfatInitFCBFromDirEntry(pVCB, ParentFcb, Fcb, DirContext); if (vfatFCBIsDirectory(Fcb)) { CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); } - Fcb->parentFcb = ParentFcb; InsertTailList(&ParentFcb->ParentListHead, &Fcb->ParentListEntry); vfatAddFCBToTable(pVCB, Fcb); @@ -739,10 +740,9 @@ vfatMakeFCBFromDirEntry( } rcFCB = vfatNewFCB(vcb, &NameU); - vfatInitFCBFromDirEntry(vcb, rcFCB, DirContext); + vfatInitFCBFromDirEntry(vcb, directoryFCB, rcFCB, DirContext); rcFCB->RefCount = 1; - rcFCB->parentFcb = directoryFCB; InsertTailList(&directoryFCB->ParentListHead, &rcFCB->ParentListEntry); vfatAddFCBToTable(vcb, rcFCB); *fileFCB = rcFCB;

1 0

[reactos] 04/06: [VFATFS] Always provide a short name for FATX files (equal to long name)
by Hervé Poussineau 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0979fb29e2647a607c404… commit 0979fb29e2647a607c40497f743cd6958931517c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:24:39 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Always provide a short name for FATX files (equal to long name) If no short name is provided, driver will think that the partition is corrupted. CORE-16373 --- drivers/filesystems/vfatfs/direntry.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/vfatfs/direntry.c b/drivers/filesystems/vfatfs/direntry.c index 2247637c8b3..8b5f8757319 100644 --- a/drivers/filesystems/vfatfs/direntry.c +++ b/drivers/filesystems/vfatfs/direntry.c @@ -497,10 +497,9 @@ FATXGetNextDirEntry( switch (DirContext->DirIndex) { case 0: /* entry . */ - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; wcscpy(DirContext->LongNameU.Buffer, L"."); DirContext->LongNameU.Length = sizeof(WCHAR); + DirContext->ShortNameU = DirContext->LongNameU; RtlCopyMemory(&DirContext->DirEntry.FatX, &pDirFcb->entry.FatX, sizeof(FATX_DIR_ENTRY)); DirContext->DirEntry.FatX.Filename[0] = '.'; DirContext->DirEntry.FatX.FilenameLength = 1; @@ -508,10 +507,9 @@ FATXGetNextDirEntry( return STATUS_SUCCESS; case 1: /* entry .. */ - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; wcscpy(DirContext->LongNameU.Buffer, L".."); DirContext->LongNameU.Length = 2 * sizeof(WCHAR); + DirContext->ShortNameU = DirContext->LongNameU; RtlCopyMemory(&DirContext->DirEntry.FatX, &pDirFcb->entry.FatX, sizeof(FATX_DIR_ENTRY)); DirContext->DirEntry.FatX.Filename[0] = DirContext->DirEntry.FatX.Filename[1] = '.'; DirContext->DirEntry.FatX.FilenameLength = 2; @@ -603,10 +601,9 @@ FATXGetNextDirEntry( fatxDirEntry++; } } - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; StringO.Buffer = (PCHAR)fatxDirEntry->Filename; StringO.Length = StringO.MaximumLength = fatxDirEntry->FilenameLength; RtlOemStringToUnicodeString(&DirContext->LongNameU, &StringO, FALSE); + DirContext->ShortNameU = DirContext->LongNameU; return STATUS_SUCCESS; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs