Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/03: [NTOS:CM] Set and reset the CMHIVE HiveIsLoading flag adequately. Fix an assertion in CmFlushKey() and reset the CMHIVE ViewLockOwner when releasing the view lock.
by Hermès Bélusca-Maïto 17 Feb '19

17 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83fdb9a6d96ac86b4b02a… commit 83fdb9a6d96ac86b4b02afc716a421336a6f2903 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 17 00:54:59 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 17 01:21:35 2019 +0100 [NTOS:CM] Set and reset the CMHIVE HiveIsLoading flag adequately. Fix an assertion in CmFlushKey() and reset the CMHIVE ViewLockOwner when releasing the view lock. --- ntoskrnl/config/cmapi.c | 20 +++++++++++++++++--- ntoskrnl/config/cminit.c | 5 ++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 3b1455df1a..fe81bbc305 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -1959,6 +1959,7 @@ CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, { /* Don't touch the hive */ CmpLockHiveFlusherExclusive(CmHive); + ASSERT(CmHive->ViewLock); KeAcquireGuardedMutex(CmHive->ViewLock); CmHive->ViewLockOwner = KeGetCurrentThread(); @@ -1968,13 +1969,18 @@ CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, { /* I don't believe the current Hv does shrinking */ ASSERT(FALSE); + // CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK_OR_LOADING(CmHive); } else { /* Now we can release views */ ASSERT(CmHive->ViewLock); - CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK_OR_LOADING(CmHive); - ASSERT(KeGetCurrentThread() == CmHive->ViewLockOwner); + // CMP_ASSERT_VIEW_LOCK_OWNED(CmHive); + ASSERT((CmpSpecialBootCondition == TRUE) || + (CmHive->HiveIsLoading == TRUE) || + (CmHive->ViewLockOwner == KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive() == TRUE)); + CmHive->ViewLockOwner = NULL; KeReleaseGuardedMutex(CmHive->ViewLock); } @@ -2240,6 +2246,9 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, } } + /* Set the loading flag */ + CmHive->HiveIsLoading = TRUE; + /* Flush the hive */ CmFlushKey(Kcb, TRUE); @@ -2248,8 +2257,13 @@ CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, { DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); - /* Remove the unloading flag and return failure */ + /* Remove the unloading flag */ Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + + /* Reset the loading flag */ + CmHive->HiveIsLoading = FALSE; + + /* Return failure */ return STATUS_INSUFFICIENT_RESOURCES; } diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index bf055fd914..5d8ea07276 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -102,7 +102,7 @@ CmpInitializeHive(OUT PCMHIVE *CmHive, Hive->NotifyList.Flink = NULL; Hive->NotifyList.Blink = NULL; - /* Set loading flag */ + /* Set the loading flag */ Hive->HiveIsLoading = TRUE; /* Set the current thread as creator */ @@ -213,6 +213,9 @@ CmpInitializeHive(OUT PCMHIVE *CmHive, } } + /* Reset the loading flag */ + Hive->HiveIsLoading = FALSE; + /* Lock the hive list */ ExAcquirePushLockExclusive(&CmpHiveListHeadLock);

1 0

[reactos] 01/01: [SNDVOL32] AUTORADIOBUTTONs are AUTORADIOBUTTONs, not PUSHBUTTONs
by Eric Kohl 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86800fc4981b485949e05… commit 86800fc4981b485949e055998c1c2ccaf0f3dd9a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 16 20:36:46 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 16 20:36:46 2019 +0100 [SNDVOL32] AUTORADIOBUTTONs are AUTORADIOBUTTONs, not PUSHBUTTONs --- base/applications/sndvol32/lang/bg-BG.rc | 6 +++--- base/applications/sndvol32/lang/cs-CZ.rc | 6 +++--- base/applications/sndvol32/lang/de-DE.rc | 6 +++--- base/applications/sndvol32/lang/el-GR.rc | 6 +++--- base/applications/sndvol32/lang/en-US.rc | 6 +++--- base/applications/sndvol32/lang/es-ES.rc | 6 +++--- base/applications/sndvol32/lang/fr-FR.rc | 6 +++--- base/applications/sndvol32/lang/he-IL.rc | 6 +++--- base/applications/sndvol32/lang/hu-HU.rc | 6 +++--- base/applications/sndvol32/lang/id-ID.rc | 6 +++--- base/applications/sndvol32/lang/it-IT.rc | 6 +++--- base/applications/sndvol32/lang/ja-JP.rc | 6 +++--- base/applications/sndvol32/lang/ko-KR.rc | 6 +++--- base/applications/sndvol32/lang/lt-LT.rc | 6 +++--- base/applications/sndvol32/lang/nl-NL.rc | 6 +++--- base/applications/sndvol32/lang/no-NO.rc | 6 +++--- base/applications/sndvol32/lang/pl-PL.rc | 6 +++--- base/applications/sndvol32/lang/pt-BR.rc | 6 +++--- base/applications/sndvol32/lang/ro-RO.rc | 6 +++--- base/applications/sndvol32/lang/ru-RU.rc | 6 +++--- base/applications/sndvol32/lang/sk-SK.rc | 6 +++--- base/applications/sndvol32/lang/sq-AL.rc | 6 +++--- base/applications/sndvol32/lang/sv-SE.rc | 6 +++--- base/applications/sndvol32/lang/th-TH.rc | 6 +++--- base/applications/sndvol32/lang/tr-TR.rc | 6 +++--- base/applications/sndvol32/lang/uk-UA.rc | 6 +++--- base/applications/sndvol32/lang/zh-CN.rc | 6 +++--- base/applications/sndvol32/lang/zh-TW.rc | 6 +++--- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index ef3df03c1f..ef3937f870 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -35,9 +35,9 @@ BEGIN LTEXT "&Смесително устройство:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Настройка на звука за:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Възпроизвеждане", IDC_PLAYBACK, 13, 43, 130, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Запис", IDC_RECORDING, 13, 61, 130, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Друго:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Възпроизвеждане", IDC_PLAYBACK, 13, 43, 130, 8 + AUTORADIOBUTTON "&Запис", IDC_RECORDING, 13, 61, 130, 8 + AUTORADIOBUTTON "&Друго:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Показване на следните управления на звука:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index b5cd44dc15..d021ab6715 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -37,9 +37,9 @@ BEGIN LTEXT "&Směšovací zařízení:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Upravit hlasitost pro:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Přehrávání", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Záznam", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Jiné:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Přehrávání", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Záznam", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Jiné:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Zobrazit tyto ovladače hlasitosti:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 854409b9e5..43e956b4a9 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mixer:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Lautstärke regeln für:", -1, 7, 25, 211, 77 - PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13, 43, 55, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13, 61, 55, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "A&ndere:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "Wie&dergabe", IDC_PLAYBACK, 13, 43, 55, 8 + AUTORADIOBUTTON "&Aufnahme", IDC_RECORDING, 13, 61, 55, 8 + AUTORADIOBUTTON "A&ndere:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Die folgenden Lautstärkeregler anzeigen:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index eb5b6edb11..52139bcda0 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Συσκευή μίξης:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Adjust volume for:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Εγγραφή", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Άλλα:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Εγγραφή", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Άλλα:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 7f8d833a05..911f2b126a 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mixer device:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Adjust volume for:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Recording", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Other:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Recording", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Other:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 87b5b6dd30..db470bfb67 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -34,9 +34,9 @@ BEGIN LTEXT "&Dispositivo me&zclador:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ajustar volumen de:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Reproducción", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Grabación", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Otros:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Reproducción", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Grabación", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Otros:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Mostrar los siguientes controles de volumen:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index e813328c0d..6f7d4e7ab8 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Périphérique de mixage :", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ajuster le volume pour :", -1, 7, 25, 211, 77 - PUSHBUTTON "&Lecture", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Enregistrement", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Autre :", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Lecture", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Enregistrement", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Autre :", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Montrer les contrôles du volume suivants :", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 3683bbda87..588a7f085b 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -32,9 +32,9 @@ BEGIN LTEXT "התקן ערבול:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "התאם עוצמה ל:", -1, 7, 25, 211, 77 - PUSHBUTTON "נגינה", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "הקלטה", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "אחר:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "נגינה", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "הקלטה", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "אחר:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "הצג את בקרי העוצמה הבאים:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 5536ac129b..f228d43760 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Keverõ eszköz:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Hangerõ szabályozás:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Lejátszás", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Felvétel", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Egyéb:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Lejátszás", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Felvétel", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Egyéb:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 61ba3a3c1a..078645050c 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mixer device:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Sesuaikan volume untuk:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "Pe&rekaman", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Lainnya:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Playback", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "Pe&rekaman", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Lainnya:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Tampilkan kontrol volume berikut:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 487a2305fe..53b2df0e9f 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mixer:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Cambia il volume per:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Riproduzione", IDC_PLAYBACK, 13, 43, 58, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Registrazione", IDC_RECORDING, 13, 61, 58, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Altro:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Riproduzione", IDC_PLAYBACK, 13, 43, 58, 8 + AUTORADIOBUTTON "&Registrazione", IDC_RECORDING, 13, 61, 58, 8 + AUTORADIOBUTTON "&Altro:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Mostra i controlli di volume seguenti:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index c98b3625c0..7c30037bcb 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "ミキサーデバイス(&M):", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "音量の調整:", -1, 7, 25, 211, 77 - PUSHBUTTON "再生(&P)", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "録音(&R)", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "その他(&O):", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "再生(&P)", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "録音(&R)", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "その他(&O):", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "表示するコントロール:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index b6ad87eb6e..3a3b8752ed 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "믹서 장치(&M):", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "볼륨 조절:", -1, 7, 25, 211, 77 - PUSHBUTTON "재생(&P)", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "녹음(&R)", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "기타(&O):", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "재생(&P)", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "녹음(&R)", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "기타(&O):", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "다음 볼륨 컨트롤 표시:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 3a8dbc24ac..5f085b9e02 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Garsų maišymo įrenginys:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Derinti garsumą:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Perklausai", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Įrašymui", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Kita:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Perklausai", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Įrašymui", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Kita:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Rodyti šiuos garso valdiklius:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index 8e82940420..2f60be9171 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mixerapparaat:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Volume aanpassen voor", -1, 7, 25, 211, 77 - PUSHBUTTON "&Afspelen", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Opnemen", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "O&verig:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Afspelen", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Opnemen", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "O&verig:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "De volgende volumeregelingen weergeven:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 6f218a8bb8..0778d36094 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -31,9 +31,9 @@ BEGIN LTEXT "&Mikser enhet:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Still volumet for:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Avspilling", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Innspilling", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Andre:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Avspilling", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Innspilling", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Andre:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Vis følgende volumkontroller:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index db78f571d6..8986d6fc4e 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -39,9 +39,9 @@ BEGIN LTEXT "Urządzenie &miksujące:", -1, 7, 8, 98, 9 COMBOBOX IDC_MIXERDEVICE, 85, 8, 133, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ustawianie głośności", -1, 7, 25, 211, 77 - PUSHBUTTON "&Odtwarzanie", IDC_PLAYBACK, 13, 43, 67, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Nagrywanie", IDC_RECORDING, 13, 61, 67, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Inne", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Odtwarzanie", IDC_PLAYBACK, 13, 43, 67, 8 + AUTORADIOBUTTON "&Nagrywanie", IDC_RECORDING, 13, 61, 67, 8 + AUTORADIOBUTTON "&Inne", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Pokaż następujące kontrolki głośności:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 5f34a7947b..b5d1f1e300 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "Dispositivo de &mixagem:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ajustar volume para:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Reprodução", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Gravação", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Outros:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Reprodução", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Gravação", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Outros:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Mostar os seguintes controles de volume:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index ce1bfde0bd..c1bbb7c62c 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "Dispozitiv de &mixaj:", -1, 7, 8, 68, 9 COMBOBOX IDC_MIXERDEVICE, 72, 8, 145, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Reglaje de volum pentru:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Lectură", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "În&registrare", IDC_RECORDING, 13, 61, 57, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Altceva:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Lectură", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "În&registrare", IDC_RECORDING, 13, 61, 57, 8 + AUTORADIOBUTTON "&Altceva:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Afișează reglaje de volum pentru:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 7d2647e60b..fe94a0a4ac 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Микшер:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Настройки громкости:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Воспроизведение", IDC_PLAYBACK, 13, 43, 80, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Запись", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Другое:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Воспроизведение", IDC_PLAYBACK, 13, 43, 80, 8 + AUTORADIOBUTTON "&Запись", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Другое:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Отображать регуляторы громкости:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 786a171f43..06295c283e 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Zariadenie zmiešavača:", -1, 7, 4, 43, 16 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Nastaviť hlasitosť pre:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Prehrávanie", IDC_PLAYBACK, 13, 43, 53, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Nahrávanie", IDC_RECORDING, 13, 61, 53, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Iné:", IDC_OTHER, 13, 80, 35, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Prehrávanie", IDC_PLAYBACK, 13, 43, 53, 8 + AUTORADIOBUTTON "&Nahrávanie", IDC_RECORDING, 13, 61, 53, 8 + AUTORADIOBUTTON "&Iné:", IDC_OTHER, 13, 80, 35, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Zobraziť tieto ovládače hlasitosti:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index 7c8b14e6ab..06bf7b4aa8 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -35,9 +35,9 @@ BEGIN LTEXT "Pjeset e mixerit:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Rrugullo volumin per:", -1, 7, 25, 211, 77 - PUSHBUTTON "Ridegjim", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "Rregjistro", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "T'jera:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "Ridegjim", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "Rregjistro", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "T'jera:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Trego kontrollet e meposhtme te volumit:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 1b9db21547..c9e86be88a 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Mixerenhet:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Justera volymen för:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Uppspelning", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Inspelning", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Andra:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Uppspelning", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Inspelning", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Andra:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Visa följander volymekontroller:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index bc0159ff96..43b8307551 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -39,9 +39,9 @@ BEGIN LTEXT "อุปกรณ์&ปรับแต่งเสียง:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "ปรับแต่งระบบเสียงให้ :", -1, 7, 25, 211, 77 - PUSHBUTTON "เ&ล่นย้อน", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&กำลังบันทึก", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&อื่นๆ:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "เ&ล่นย้อน", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&กำลังบันทึก", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&อื่นๆ:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "แสดงการควบคุมระบบเสียง :", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 773cc13c8a..5eeec0ed7a 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "&Karıştırıcı Aygıt:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ses Düzeyi Düzenlenecekler", -1, 7, 25, 211, 77 - PUSHBUTTON "&Çalma", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Saklama", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Başka:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Çalma", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Saklama", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Başka:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Aşağıdaki ses düzeyi denetimlerini göster:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 7da1223a32..72a9a16a36 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -39,9 +39,9 @@ BEGIN LTEXT "&Мікшер:", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Регуляція гучності для:", -1, 7, 25, 211, 77 - PUSHBUTTON "&Відтворення", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Запис", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Інше:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "&Відтворення", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "&Запис", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "&Інше:", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Відображати наступні регулятори гучності:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index 0efeb379e3..7f264976d0 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "混音设备(&M)：", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "为...调节音量：", -1, 7, 25, 211, 77 - PUSHBUTTON "回放(&P)", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "录音(&R)", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "其他(&O)：", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "回放(&P)", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "录音(&R)", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "其他(&O)：", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "显示以下的音量控制：", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index f91c80d2c2..06db36d7ee 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -33,9 +33,9 @@ BEGIN LTEXT "混音設備(&M)：", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "為...調節音量：", -1, 7, 25, 211, 77 - PUSHBUTTON "播放(&P)", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "錄音(&R)", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "其他(&O)：", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + AUTORADIOBUTTON "播放(&P)", IDC_PLAYBACK, 13, 43, 47, 8 + AUTORADIOBUTTON "錄音(&R)", IDC_RECORDING, 13, 61, 47, 8 + AUTORADIOBUTTON "其他(&O)：", IDC_OTHER, 13, 80, 42, 8, WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "顯示以下的音量控制：", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96

1 0

[reactos] 01/01: [SNDVOL32] Change the menu item prefix from IDC to IDM
by Eric Kohl 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f721e03d2eadcd547c02d… commit f721e03d2eadcd547c02d84f536732730ebbedff Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 16 19:22:57 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 16 19:23:44 2019 +0100 [SNDVOL32] Change the menu item prefix from IDC to IDM --- base/applications/sndvol32/lang/bg-BG.rc | 10 +++++----- base/applications/sndvol32/lang/cs-CZ.rc | 10 +++++----- base/applications/sndvol32/lang/de-DE.rc | 10 +++++----- base/applications/sndvol32/lang/el-GR.rc | 10 +++++----- base/applications/sndvol32/lang/en-US.rc | 10 +++++----- base/applications/sndvol32/lang/es-ES.rc | 10 +++++----- base/applications/sndvol32/lang/fr-FR.rc | 10 +++++----- base/applications/sndvol32/lang/he-IL.rc | 10 +++++----- base/applications/sndvol32/lang/hu-HU.rc | 10 +++++----- base/applications/sndvol32/lang/id-ID.rc | 10 +++++----- base/applications/sndvol32/lang/it-IT.rc | 10 +++++----- base/applications/sndvol32/lang/ja-JP.rc | 10 +++++----- base/applications/sndvol32/lang/ko-KR.rc | 10 +++++----- base/applications/sndvol32/lang/lt-LT.rc | 10 +++++----- base/applications/sndvol32/lang/nl-NL.rc | 10 +++++----- base/applications/sndvol32/lang/no-NO.rc | 10 +++++----- base/applications/sndvol32/lang/pl-PL.rc | 10 +++++----- base/applications/sndvol32/lang/pt-BR.rc | 10 +++++----- base/applications/sndvol32/lang/ro-RO.rc | 10 +++++----- base/applications/sndvol32/lang/ru-RU.rc | 10 +++++----- base/applications/sndvol32/lang/sk-SK.rc | 10 +++++----- base/applications/sndvol32/lang/sq-AL.rc | 10 +++++----- base/applications/sndvol32/lang/sv-SE.rc | 10 +++++----- base/applications/sndvol32/lang/th-TH.rc | 10 +++++----- base/applications/sndvol32/lang/tr-TR.rc | 10 +++++----- base/applications/sndvol32/lang/uk-UA.rc | 10 +++++----- base/applications/sndvol32/lang/zh-CN.rc | 10 +++++----- base/applications/sndvol32/lang/zh-TW.rc | 10 +++++----- base/applications/sndvol32/resources.h | 10 +++++----- base/applications/sndvol32/sndvol32.c | 8 ++++---- 30 files changed, 149 insertions(+), 149 deletions(-) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 5e8505fa49..ef3df03c1f 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -8,16 +8,16 @@ IDM_MAINMENU MENU BEGIN POPUP "Въз&можности" BEGIN - MENUITEM "С&войства", IDC_PROPERTIES - MENUITEM "&Разширени настройки", IDC_ADVANCED_CONTROLS + MENUITEM "С&войства", IDM_PROPERTIES + MENUITEM "&Разширени настройки", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Из&ход", IDC_EXIT + MENUITEM "Из&ход", IDM_EXIT END POPUP "&Помощ" BEGIN - MENUITEM "&Съдържание на помощта", IDC_HELP_TOPICS + MENUITEM "&Съдържание на помощта", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&За Сила на звука", IDC_ABOUT + MENUITEM "&За Сила на звука", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index c15c99fbca..b5cd44dc15 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -10,16 +10,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Nastavení" BEGIN - MENUITEM "&Možnosti", IDC_PROPERTIES - MENUITEM "&Rozšířené nastavení", IDC_ADVANCED_CONTROLS + MENUITEM "&Možnosti", IDM_PROPERTIES + MENUITEM "&Rozšířené nastavení", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Konec", IDC_EXIT + MENUITEM "&Konec", IDM_EXIT END POPUP "&Nápověda" BEGIN - MENUITEM "&Témata nápovědy", IDC_HELP_TOPICS + MENUITEM "&Témata nápovědy", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&O ovládání hlasitosti ...", IDC_ABOUT + MENUITEM "&O ovládání hlasitosti ...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 4541f7f1e0..854409b9e5 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Optionen" BEGIN - MENUITEM "&Eigenschaften", IDC_PROPERTIES - MENUITEM "Erweiterte Ein&stellungen", IDC_ADVANCED_CONTROLS + MENUITEM "&Eigenschaften", IDM_PROPERTIES + MENUITEM "Erweiterte Ein&stellungen", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Beenden", IDC_EXIT + MENUITEM "&Beenden", IDM_EXIT END POPUP "&?" BEGIN - MENUITEM "&Hilfethemen", IDC_HELP_TOPICS + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Info", IDC_ABOUT + MENUITEM "&Info", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 8bcbb89d19..eb5b6edb11 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&ptions" BEGIN - MENUITEM "Ι&διότητες", IDC_PROPERTIES - MENUITEM "&Advanced Controls", IDC_ADVANCED_CONTROLS + MENUITEM "Ι&διότητες", IDM_PROPERTIES + MENUITEM "&Advanced Controls", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Έ&ξοδος", IDC_EXIT + MENUITEM "Έ&ξοδος", IDM_EXIT END POPUP "&Βοήθεια" BEGIN - MENUITEM "&Θέματα Βοήθειας", IDC_HELP_TOPICS + MENUITEM "&Θέματα Βοήθειας", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Σχετικά με τον έλεγχο έντασης", IDC_ABOUT + MENUITEM "&Σχετικά με τον έλεγχο έντασης", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 543cb2dab8..7f8d833a05 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&ptions" BEGIN - MENUITEM "P&roperties", IDC_PROPERTIES - MENUITEM "&Advanced Controls", IDC_ADVANCED_CONTROLS + MENUITEM "P&roperties", IDM_PROPERTIES + MENUITEM "&Advanced Controls", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "&Help" BEGIN - MENUITEM "&Help Topics", IDC_HELP_TOPICS + MENUITEM "&Help Topics", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&About Volume Control", IDC_ABOUT + MENUITEM "&About Volume Control", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 8c781ac828..87b5b6dd30 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Opciones" BEGIN - MENUITEM "P&ropiedades", IDC_PROPERTIES - MENUITEM "&Controles avanzados", IDC_ADVANCED_CONTROLS + MENUITEM "P&ropiedades", IDM_PROPERTIES + MENUITEM "&Controles avanzados", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Salir", IDC_EXIT + MENUITEM "&Salir", IDM_EXIT END POPUP "Ay&uda" BEGIN - MENUITEM "&Temas de ayuda", IDC_HELP_TOPICS + MENUITEM "&Temas de ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Acerca de Control de volumen", IDC_ABOUT + MENUITEM "&Acerca de Control de volumen", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index d856549b77..e813328c0d 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&ptions" BEGIN - MENUITEM "P&ropriétés", IDC_PROPERTIES - MENUITEM "&Contrôles avancés", IDC_ADVANCED_CONTROLS + MENUITEM "P&ropriétés", IDM_PROPERTIES + MENUITEM "&Contrôles avancés", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Q&uitter", IDC_EXIT + MENUITEM "Q&uitter", IDM_EXIT END POPUP "&?" BEGIN - MENUITEM "&Aide", IDC_HELP_TOPICS + MENUITEM "&Aide", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "À &propos ...", IDC_ABOUT + MENUITEM "À &propos ...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index a01eced407..3683bbda87 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "אפשרויות" BEGIN - MENUITEM "מאפיינים", IDC_PROPERTIES - MENUITEM "בקרים מתקדמים", IDC_ADVANCED_CONTROLS + MENUITEM "מאפיינים", IDM_PROPERTIES + MENUITEM "בקרים מתקדמים", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "יציאה", IDC_EXIT + MENUITEM "יציאה", IDM_EXIT END POPUP "עזרה" BEGIN - MENUITEM "נושאי עזרה", IDC_HELP_TOPICS + MENUITEM "נושאי עזרה", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "אודות בקרת עוצמה", IDC_ABOUT + MENUITEM "אודות בקרת עוצמה", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 0a128f1fd1..5536ac129b 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Beállítások" BEGIN - MENUITEM "&Tulajdonságok", IDC_PROPERTIES - MENUITEM "&Részletes beállítások", IDC_ADVANCED_CONTROLS + MENUITEM "&Tulajdonságok", IDM_PROPERTIES + MENUITEM "&Részletes beállítások", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Kilépés", IDC_EXIT + MENUITEM "&Kilépés", IDM_EXIT END POPUP "&Súgó" BEGIN - MENUITEM "Súgó &témák", IDC_HELP_TOPICS + MENUITEM "Súgó &témák", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Névjegy ...", IDC_ABOUT + MENUITEM "&Névjegy ...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index f9bb31d4bc..61ba3a3c1a 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&psi" BEGIN - MENUITEM "P&roperti", IDC_PROPERTIES - MENUITEM "Kontrol L&anjutan", IDC_ADVANCED_CONTROLS + MENUITEM "P&roperti", IDM_PROPERTIES + MENUITEM "Kontrol L&anjutan", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Keluar", IDC_EXIT + MENUITEM "&Keluar", IDM_EXIT END POPUP "&Bantuan" BEGIN - MENUITEM "Daftar Isi &Bantuan", IDC_HELP_TOPICS + MENUITEM "Daftar Isi &Bantuan", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Tentang Kontrol Volume", IDC_ABOUT + MENUITEM "&Tentang Kontrol Volume", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 40b4f6aff5..487a2305fe 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&pzioni" BEGIN - MENUITEM "P&roprietà", IDC_PROPERTIES - MENUITEM "&Controlli avanzati", IDC_ADVANCED_CONTROLS + MENUITEM "P&roprietà", IDM_PROPERTIES + MENUITEM "&Controlli avanzati", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "E&sci", IDC_EXIT + MENUITEM "E&sci", IDM_EXIT END POPUP "&Aiuto" BEGIN - MENUITEM "&Guida in linea", IDC_HELP_TOPICS + MENUITEM "&Guida in linea", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Informazioni su Controllo Volume", IDC_ABOUT + MENUITEM "&Informazioni su Controllo Volume", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 0aacbcd629..c98b3625c0 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "オプション(&P)" BEGIN - MENUITEM "プロパティ(&R)", IDC_PROPERTIES - MENUITEM "トーン調整(&A)", IDC_ADVANCED_CONTROLS + MENUITEM "プロパティ(&R)", IDM_PROPERTIES + MENUITEM "トーン調整(&A)", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "ボリュームコントロールの終了(&X)", IDC_EXIT + MENUITEM "ボリュームコントロールの終了(&X)", IDM_EXIT END POPUP "ヘルプ(&H)" BEGIN - MENUITEM "トピックの検索(&H)", IDC_HELP_TOPICS + MENUITEM "トピックの検索(&H)", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "バージョン情報(&A)...", IDC_ABOUT + MENUITEM "バージョン情報(&A)...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index d27fc4cf74..b6ad87eb6e 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "옵션(&P)" BEGIN - MENUITEM "속성(&R)", IDC_PROPERTIES - MENUITEM "고급 컨트롤(&A)", IDC_ADVANCED_CONTROLS + MENUITEM "속성(&R)", IDM_PROPERTIES + MENUITEM "고급 컨트롤(&A)", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "종료(&X)", IDC_EXIT + MENUITEM "종료(&X)", IDM_EXIT END POPUP "도움말(&H)" BEGIN - MENUITEM "도움말 항목(&H)", IDC_HELP_TOPICS + MENUITEM "도움말 항목(&H)", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "볼륨 컨트롤 정보(&A)", IDC_ABOUT + MENUITEM "볼륨 컨트롤 정보(&A)", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 9ab0e776e9..3a8dbc24ac 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Parametrai" BEGIN - MENUITEM "&Nustatymai", IDC_PROPERTIES - MENUITEM "Papildomi &valdymo elementai", IDC_ADVANCED_CONTROLS + MENUITEM "&Nustatymai", IDM_PROPERTIES + MENUITEM "Papildomi &valdymo elementai", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Baigti", IDC_EXIT + MENUITEM "&Baigti", IDM_EXIT END POPUP "Pa&galba" BEGIN - MENUITEM "&Pagalba", IDC_HELP_TOPICS + MENUITEM "&Pagalba", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Apie garso valdiklį", IDC_ABOUT + MENUITEM "&Apie garso valdiklį", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index 59ad09e249..8e82940420 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&pties" BEGIN - MENUITEM "Eigenscha&ppen", IDC_PROPERTIES - MENUITEM "&Geavanceerde volumeregelingen", IDC_ADVANCED_CONTROLS + MENUITEM "Eigenscha&ppen", IDM_PROPERTIES + MENUITEM "&Geavanceerde volumeregelingen", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Afsluiten", IDC_EXIT + MENUITEM "&Afsluiten", IDM_EXIT END POPUP "&Help" BEGIN - MENUITEM "Help-&onderwerpen", IDC_HELP_TOPICS + MENUITEM "Help-&onderwerpen", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Info", IDC_ABOUT + MENUITEM "&Info", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 413bb6f3b2..6f218a8bb8 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -4,16 +4,16 @@ IDM_MAINMENU MENU BEGIN POPUP "I&nnstillinger" BEGIN - MENUITEM "E&genskaper", IDC_PROPERTIES - MENUITEM "&Avansert Kontroller", IDC_ADVANCED_CONTROLS + MENUITEM "E&genskaper", IDM_PROPERTIES + MENUITEM "&Avansert Kontroller", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "A&vslutt", IDC_EXIT + MENUITEM "A&vslutt", IDM_EXIT END POPUP "&Hjelp" BEGIN - MENUITEM "&Emner i hjelp", IDC_HELP_TOPICS + MENUITEM "&Emner i hjelp", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Om Volumkontroll", IDC_ABOUT + MENUITEM "&Om Volumkontroll", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 913aafe04b..db78f571d6 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -12,16 +12,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Opcje" BEGIN - MENUITEM "&Właściwości", IDC_PROPERTIES - MENUITEM "&Tryb zaawansowany", IDC_ADVANCED_CONTROLS + MENUITEM "&Właściwości", IDM_PROPERTIES + MENUITEM "&Tryb zaawansowany", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Zakoń&cz", IDC_EXIT + MENUITEM "Zakoń&cz", IDM_EXIT END POPUP "Pomo&c" BEGIN - MENUITEM "&Tematy pomocy", IDC_HELP_TOPICS + MENUITEM "&Tematy pomocy", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Regulacja głośności - informacje", IDC_ABOUT + MENUITEM "&Regulacja głośności - informacje", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 0918e2c222..5f34a7947b 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Opções" BEGIN - MENUITEM "&Propriedades", IDC_PROPERTIES - MENUITEM "&Controles avançados", IDC_ADVANCED_CONTROLS + MENUITEM "&Propriedades", IDM_PROPERTIES + MENUITEM "&Controles avançados", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Sai&r", IDC_EXIT + MENUITEM "Sai&r", IDM_EXIT END POPUP "Aj&uda" BEGIN - MENUITEM "Tópicos de &ajuda", IDC_HELP_TOPICS + MENUITEM "Tópicos de &ajuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "Sobre o &Controle de Volume", IDC_ABOUT + MENUITEM "Sobre o &Controle de Volume", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index 5154b07d4c..ce1bfde0bd 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Opțiuni" BEGIN - MENUITEM "&Proprietăți", IDC_PROPERTIES - MENUITEM "Reglaje a&vansate", IDC_ADVANCED_CONTROLS + MENUITEM "&Proprietăți", IDM_PROPERTIES + MENUITEM "Reglaje a&vansate", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "I&eșire", IDC_EXIT + MENUITEM "I&eșire", IDM_EXIT END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…", IDC_HELP_TOPICS + MENUITEM "&Manual…", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Despre…", IDC_ABOUT + MENUITEM "&Despre…", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index a0efe18b2a..7d2647e60b 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Параметры" BEGIN - MENUITEM "&Свойства", IDC_PROPERTIES - MENUITEM "&Дополнительные параметры", IDC_ADVANCED_CONTROLS + MENUITEM "&Свойства", IDM_PROPERTIES + MENUITEM "&Дополнительные параметры", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Выход", IDC_EXIT + MENUITEM "&Выход", IDM_EXIT END POPUP "&Справка" BEGIN - MENUITEM "&Вызов справки", IDC_HELP_TOPICS + MENUITEM "&Вызов справки", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&О программе", IDC_ABOUT + MENUITEM "&О программе", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 389672c26b..786a171f43 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Možnosti" BEGIN - MENUITEM "&Vlastnosti", IDC_PROPERTIES - MENUITEM "Rozšírené &ovládanie", IDC_ADVANCED_CONTROLS + MENUITEM "&Vlastnosti", IDM_PROPERTIES + MENUITEM "Rozšírené &ovládanie", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Skončiť", IDC_EXIT + MENUITEM "&Skončiť", IDM_EXIT END POPUP "&Pomocník" BEGIN - MENUITEM "&Témy Pomocníka", IDC_HELP_TOPICS + MENUITEM "&Témy Pomocníka", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "Č&o je Ovládanie hlasitosti", IDC_ABOUT + MENUITEM "Č&o je Ovládanie hlasitosti", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index ee5a359347..7c8b14e6ab 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -8,16 +8,16 @@ IDM_MAINMENU MENU BEGIN POPUP "O&psione" BEGIN - MENUITEM "Tipare", IDC_PROPERTIES - MENUITEM "Kontroll i Avancum", IDC_ADVANCED_CONTROLS + MENUITEM "Tipare", IDM_PROPERTIES + MENUITEM "Kontroll i Avancum", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "Dil", IDC_EXIT + MENUITEM "Dil", IDM_EXIT END POPUP "Ndihmë" BEGIN - MENUITEM "Ndihmë temë", IDC_HELP_TOPICS + MENUITEM "Ndihmë temë", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "Rreth Kontrollit Volumit", IDC_ABOUT + MENUITEM "Rreth Kontrollit Volumit", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 8cee049096..1b9db21547 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Alternativ" BEGIN - MENUITEM "&Inställningar", IDC_PROPERTIES - MENUITEM "A&vancerade kontroller", IDC_ADVANCED_CONTROLS + MENUITEM "&Inställningar", IDM_PROPERTIES + MENUITEM "A&vancerade kontroller", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Avsluta", IDC_EXIT + MENUITEM "&Avsluta", IDM_EXIT END POPUP "&Hjälp" BEGIN - MENUITEM "&Hjälpavsnitt", IDC_HELP_TOPICS + MENUITEM "&Hjälpavsnitt", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Om ...", IDC_ABOUT + MENUITEM "&Om ...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index c0bb9a9564..bc0159ff96 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -12,16 +12,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&ตัวเลือก" BEGIN - MENUITEM "&คุณสมบัติ", IDC_PROPERTIES - MENUITEM "ควบคุมแบบ&ขั้นสูง", IDC_ADVANCED_CONTROLS + MENUITEM "&คุณสมบัติ", IDM_PROPERTIES + MENUITEM "ควบคุมแบบ&ขั้นสูง", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&ออกจากโปรแกรม", IDC_EXIT + MENUITEM "&ออกจากโปรแกรม", IDM_EXIT END POPUP "&ช่วยเหลือ" BEGIN - MENUITEM "เ&นื้อหาในการช่วยเหลือ", IDC_HELP_TOPICS + MENUITEM "เ&นื้อหาในการช่วยเหลือ", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "เ&กี่ยวกับแผงควบคุมระบบเสียง", IDC_ABOUT + MENUITEM "เ&กี่ยวกับแผงควบคุมระบบเสียง", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 8bc678ec7c..773cc13c8a 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Seçenekler" BEGIN - MENUITEM "&Husûsiyetler...", IDC_PROPERTIES - MENUITEM "&Gelişmiş Denetimler", IDC_ADVANCED_CONTROLS + MENUITEM "&Husûsiyetler...", IDM_PROPERTIES + MENUITEM "&Gelişmiş Denetimler", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "&Çıkış", IDC_EXIT + MENUITEM "&Çıkış", IDM_EXIT END POPUP "&Yardım" BEGIN - MENUITEM "&Yardım Konuları", IDC_HELP_TOPICS + MENUITEM "&Yardım Konuları", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Ses Düzeyi Denetimi Üzerine...", IDC_ABOUT + MENUITEM "&Ses Düzeyi Denetimi Üzerine...", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 78663d5cc2..7da1223a32 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -12,16 +12,16 @@ IDM_MAINMENU MENU BEGIN POPUP "&Параметри" BEGIN - MENUITEM "&Властивості", IDC_PROPERTIES - MENUITEM "&Додаткові параметри", IDC_ADVANCED_CONTROLS + MENUITEM "&Властивості", IDM_PROPERTIES + MENUITEM "&Додаткові параметри", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "В&ихід", IDC_EXIT + MENUITEM "В&ихід", IDM_EXIT END POPUP "До&відка" BEGIN - MENUITEM "&Зміст", IDC_HELP_TOPICS + MENUITEM "&Зміст", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Про регулятор гучності", IDC_ABOUT + MENUITEM "&Про регулятор гучності", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index c1ef52d7c4..0efeb379e3 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "选项(&P)" BEGIN - MENUITEM "属性(&R)", IDC_PROPERTIES - MENUITEM "高级控制(&A)", IDC_ADVANCED_CONTROLS + MENUITEM "属性(&R)", IDM_PROPERTIES + MENUITEM "高级控制(&A)", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "退出(&X)", IDC_EXIT + MENUITEM "退出(&X)", IDM_EXIT END POPUP "帮助(&H)" BEGIN - MENUITEM "帮助主题(&T)", IDC_HELP_TOPICS + MENUITEM "帮助主题(&T)", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "关于音量控制(&A)", IDC_ABOUT + MENUITEM "关于音量控制(&A)", IDM_ABOUT END END diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index 24445dad48..f91c80d2c2 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -6,16 +6,16 @@ IDM_MAINMENU MENU BEGIN POPUP "選項(&P)" BEGIN - MENUITEM "屬性(&R)", IDC_PROPERTIES - MENUITEM "進階控制(&A)", IDC_ADVANCED_CONTROLS + MENUITEM "屬性(&R)", IDM_PROPERTIES + MENUITEM "進階控制(&A)", IDM_ADVANCED_CONTROLS MENUITEM SEPARATOR - MENUITEM "結束(&X)", IDC_EXIT + MENUITEM "結束(&X)", IDM_EXIT END POPUP "說明(&H)" BEGIN - MENUITEM "說明主題(&T)", IDC_HELP_TOPICS + MENUITEM "說明主題(&T)", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "關於音量控制(&A)", IDC_ABOUT + MENUITEM "關於音量控制(&A)", IDM_ABOUT END END diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 92d3dada2e..c1aef28f19 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -6,11 +6,11 @@ #define IDI_SPEAKER_LEFT 302 #define IDI_SPEAKER_RIGHT 303 -#define IDC_PROPERTIES 1001 -#define IDC_ADVANCED_CONTROLS 1002 -#define IDC_EXIT 1003 -#define IDC_HELP_TOPICS 1101 -#define IDC_ABOUT 1102 +#define IDM_PROPERTIES 1001 +#define IDM_ADVANCED_CONTROLS 1002 +#define IDM_EXIT 1003 +#define IDM_HELP_TOPICS 1101 +#define IDM_ABOUT 1102 #define IDC_MIXERDEVICE 1001 #define IDC_PLAYBACK 1002 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 7f3d118369..9d20e45526 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -894,7 +894,7 @@ MainWindowProc(HWND hwnd, switch (LOWORD(wParam)) { - case IDC_PROPERTIES: + case IDM_PROPERTIES: { PREFERENCES_CONTEXT Pref; @@ -961,13 +961,13 @@ MainWindowProc(HWND hwnd, break; } - case IDC_EXIT: + case IDM_EXIT: { PostQuitMessage(0); break; } - case IDC_ABOUT: + case IDM_ABOUT: { HICON hAppIcon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICON); @@ -1185,7 +1185,7 @@ MainWindowProc(HWND hwnd, } /* Disable the 'Advanced Controls' menu item */ - EnableMenuItem(GetMenu(hwnd), IDC_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(GetMenu(hwnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); } break; }

1 0

[reactos] 01/01: [WIN32K:NTUSER] Do not try to reposition an off-screen menu as if it were a popup menu CORE-15733
by Mark Jansen 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7ae8690abf9620a6998e… commit d7ae8690abf9620a6998e73a734688fb52f3319d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 16 15:07:49 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 16 15:45:46 2019 +0100 [WIN32K:NTUSER] Do not try to reposition an off-screen menu as if it were a popup menu CORE-15733 --- win32ss/user/ntuser/menu.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index eb8874c0cb..5e48e5a5f7 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2866,16 +2866,17 @@ static BOOL MENU_InitPopup( PWND pWndOwner, PMENU menu, UINT flags ) * Display a popup menu. */ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT flags, - INT x, INT y, INT xanchor, INT yanchor ) + INT x, INT y) { UINT width, height; POINT pt; PMONITOR monitor; PWND pWnd; USER_REFERENCE_ENTRY Ref; + BOOL bIsPopup = (flags & TPM_POPUPMENU) != 0; - TRACE("owner=%p menu=%p id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", - pwndOwner, menu, id, x, y, xanchor, yanchor); + TRACE("owner=%p menu=%p id=0x%04x x=0x%04x y=0x%04x\n", + pwndOwner, menu, id, x, y); if (menu->iItem != NO_SELECTED_ITEM) { @@ -2896,7 +2897,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl pt.y = y; monitor = UserMonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); - if (flags & TPM_LAYOUTRTL) + if (flags & TPM_LAYOUTRTL) flags ^= TPM_RIGHTALIGN; if( flags & TPM_RIGHTALIGN ) x -= width; @@ -2907,14 +2908,11 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( x + width > monitor->rcMonitor.right) { - if( xanchor && x >= width - xanchor ) - x -= width - xanchor; - if( x + width > monitor->rcMonitor.right) { /* If we would flip around our origin, would we go off screen on the other side? Or is our origin itself too far to the right already? */ - if (x - width < monitor->rcMonitor.left || x > monitor->rcMonitor.right) + if (!bIsPopup || x - width < monitor->rcMonitor.left || x > monitor->rcMonitor.right) x = monitor->rcMonitor.right - width; else x -= width; @@ -2923,7 +2921,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( x < monitor->rcMonitor.left ) { /* If we would flip around our origin, would we go off screen on the other side? */ - if (x + width > monitor->rcMonitor.right) + if (!bIsPopup || x + width > monitor->rcMonitor.right) x = monitor->rcMonitor.left; else x += width; @@ -2931,14 +2929,11 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( y + height > monitor->rcMonitor.bottom) { - if( yanchor && y >= height + yanchor ) - y -= height + yanchor; - if( y + height > monitor->rcMonitor.bottom) { /* If we would flip around our origin, would we go off screen on the other side? Or is our origin itself too far to the bottom already? */ - if (y - height < monitor->rcMonitor.top || y > monitor->rcMonitor.bottom) + if (!bIsPopup || y - height < monitor->rcMonitor.top || y > monitor->rcMonitor.bottom) y = monitor->rcMonitor.bottom - height; else y -= height; @@ -2947,7 +2942,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl if( y < monitor->rcMonitor.top ) { /* If we would flip around our origin, would we go off screen on the other side? */ - if (y + height > monitor->rcMonitor.bottom) + if (!bIsPopup || y + height > monitor->rcMonitor.bottom) y = monitor->rcMonitor.top; else y += height; @@ -3310,7 +3305,7 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi MENU_InitPopup( WndOwner, Item->spSubMenu, Flags ); MENU_ShowPopup( WndOwner, Item->spSubMenu, Menu->iItem, Flags, - Rect.left, Rect.top, Rect.right, Rect.bottom ); + Rect.left, Rect.top); if (SelectFirst) { MENU_MoveSelection(WndOwner, Item->spSubMenu, ITEM_NEXT); @@ -4452,7 +4447,7 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, if (menu->fFlags & MNF_SYSMENU) MENU_InitSysMenuPopup( menu, pWnd->style, pWnd->pcls->style, HTSYSMENU); - if (MENU_ShowPopup(pWnd, menu, 0, wFlags, x, y, 0, 0 )) + if (MENU_ShowPopup(pWnd, menu, 0, wFlags | TPM_POPUPMENU, x, y)) ret = MENU_TrackMenu( menu, wFlags | TPM_POPUPMENU, 0, 0, pWnd, lpTpm ? &lpTpm->rcExclude : NULL); else

1 0

[reactos] 01/01: [KERNEL32] Stub SetThreadErrorMode()
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db3f3921b6f7bab5f603a… commit db3f3921b6f7bab5f603a7573836d09113966541 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 14:12:01 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 14:12:55 2019 +0100 [KERNEL32] Stub SetThreadErrorMode() Now, Steam crashes because of the stub of GetSystemTimePreciseAsFileTime CORE-14966 --- dll/win32/kernel32/kernel32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index f3ee418b65..c9176d89a3 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -617,6 +617,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) +@ stub -version=0x600+ GetThreadErrorMode @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) @ stdcall GetThreadLocale() @@ -1068,6 +1069,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) +@ stub -version=0x600+ SetThreadErrorMode @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long)

1 0

[reactos] 01/01: [SNDVOL32] Enable the balance and volume trackbars only if the line has a volume fader control.
by Eric Kohl 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dd4b354b47c16fe6d46b… commit 0dd4b354b47c16fe6d46b1be8f3a426cbef068db Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 16 13:54:46 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 16 13:55:31 2019 +0100 [SNDVOL32] Enable the balance and volume trackbars only if the line has a volume fader control. --- base/applications/sndvol32/dialog.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index b8173ab763..9aed047faf 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -175,6 +175,9 @@ AddDialogControl( { /* Vertical trackbar: Volume */ + /* Disable the volume trackbar by default */ + EnableWindow(hwnd, FALSE); + /* set up range */ SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); @@ -195,6 +198,9 @@ AddDialogControl( { /* Horizontal trackbar: Balance */ + /* Disable the balance trackbar by default */ + EnableWindow(hwnd, FALSE); + /* set up range */ SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, BALANCE_STEPS)); @@ -488,7 +494,7 @@ EnumConnectionsCallback( /* now go through all controls and update their states */ for (Index = 0; Index < Line->cControls; Index++) { - if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH) + if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { MIXERCONTROLDETAILS_BOOLEAN Details; @@ -516,7 +522,7 @@ EnumConnectionsCallback( } } } - else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) + else if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { /* get volume control details */ if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1) @@ -582,6 +588,9 @@ EnumConnectionsCallback( /* check state */ LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); + /* Enable the volume trackbar */ + EnableWindow(hDlgCtrl, TRUE); + if (OldPosition != (VOLUME_MAX - volumePosition)) { /* update control state */ @@ -589,19 +598,7 @@ EnumConnectionsCallback( } } - if (Line->cChannels == 1) - { - /* Disable the balance trackbar for mono channels */ - wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; - - /* get dialog control */ - hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); - if (hDlgCtrl != NULL) - { - EnableWindow(hDlgCtrl, FALSE); - } - } - else if (Line->cChannels == 2) + if (Line->cChannels == 2) { /* Set the balance trackbar */ wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; @@ -614,6 +611,9 @@ EnumConnectionsCallback( /* check state */ LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); + /* Enable the balance trackbar */ + EnableWindow(hDlgCtrl, TRUE); + if (OldPosition != balancePosition) { /* update control state */

1 0

[reactos] 01/01: [MSAFD] Add an initial implementation of SIO_GET_EXTENSION_FUNCTION_POINTER IOCTL
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b1f6c8b0d73b80c9aeaf… commit 2b1f6c8b0d73b80c9aeaf8808c66c0c52eb1f320 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 13:46:40 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 13:51:32 2019 +0100 [MSAFD] Add an initial implementation of SIO_GET_EXTENSION_FUNCTION_POINTER IOCTL Also stub the related functions the IOCTL will return, namely: WSAID_ACCEPTEX, WSAID_CONNECTEX, WSAID_DISCONNECTEX, WSAID_GETACCEPTEXSOCKADDRS This will allow Steam client not to fail in an ASSERT related to the Steam client PlatformSocketsInit function. Even though, this doesn't fix Steam running on ReactOS since its UI requires a Windows 7 API from Kernel32: SetThreadErrorMode(). Nota: its crash got fixed thanks to the Wine sync done recently. CORE-14966 --- dll/win32/msafd/misc/dllmain.c | 57 ++++++++++++++++++++++++++++++++++++++- dll/win32/msafd/misc/stubs.c | 61 ++++++++++++++++++++++++++++++++++++++++++ dll/win32/msafd/msafd.h | 42 +++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 1 deletion(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index 5ec1bc151a..e604d2f15a 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -5,6 +5,7 @@ * PURPOSE: DLL entry point * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) + * Pierre Schweitzer (pierre(a)reactos.org) * REVISIONS: * CSH 01/09-2000 Created * Alex 16/07/2004 - Complete Rewrite @@ -2466,7 +2467,61 @@ WSPIoctl(IN SOCKET Handle, Ret = NO_ERROR; break; case SIO_GET_EXTENSION_FUNCTION_POINTER: - Errno = WSAEINVAL; + if (cbOutBuffer == 0) + { + cbRet = sizeof(PVOID); + Errno = WSAEFAULT; + break; + } + + if (cbInBuffer < sizeof(GUID) || + cbOutBuffer < sizeof(PVOID)) + { + Errno = WSAEINVAL; + break; + } + + { + GUID AcceptExGUID = WSAID_ACCEPTEX; + GUID ConnectExGUID = WSAID_CONNECTEX; + GUID DisconnectExGUID = WSAID_DISCONNECTEX; + GUID GetAcceptExSockaddrsGUID = WSAID_GETACCEPTEXSOCKADDRS; + + if (IsEqualGUID(&AcceptExGUID, lpvInBuffer)) + { + *((PVOID *)lpvOutBuffer) = WSPAcceptEx; + cbRet = sizeof(PVOID); + Errno = NO_ERROR; + Ret = NO_ERROR; + } + else if (IsEqualGUID(&ConnectExGUID, lpvInBuffer)) + { + *((PVOID *)lpvOutBuffer) = WSPConnectEx; + cbRet = sizeof(PVOID); + Errno = NO_ERROR; + Ret = NO_ERROR; + } + else if (IsEqualGUID(&DisconnectExGUID, lpvInBuffer)) + { + *((PVOID *)lpvOutBuffer) = WSPDisconnectEx; + cbRet = sizeof(PVOID); + Errno = NO_ERROR; + Ret = NO_ERROR; + } + else if (IsEqualGUID(&GetAcceptExSockaddrsGUID, lpvInBuffer)) + { + *((PVOID *)lpvOutBuffer) = WSPGetAcceptExSockaddrs; + cbRet = sizeof(PVOID); + Errno = NO_ERROR; + Ret = NO_ERROR; + } + else + { + ERR("Querying unknown extension function: %x\n", ((GUID*)lpvInBuffer)->Data1); + Errno = WSAEOPNOTSUPP; + } + } + break; case SIO_ADDRESS_LIST_QUERY: if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) diff --git a/dll/win32/msafd/misc/stubs.c b/dll/win32/msafd/misc/stubs.c index 2ee41289cd..74d13c188b 100644 --- a/dll/win32/msafd/misc/stubs.c +++ b/dll/win32/msafd/misc/stubs.c @@ -53,4 +53,65 @@ WSPJoinLeaf( return (SOCKET)0; } +BOOL +WSPAPI +WSPAcceptEx( + IN SOCKET sListenSocket, + IN SOCKET sAcceptSocket, + OUT PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT LPDWORD lpdwBytesReceived, + IN OUT LPOVERLAPPED lpOverlapped) +{ + UNIMPLEMENTED; + + return FALSE; +} + +BOOL +WSPAPI +WSPConnectEx( + IN SOCKET s, + IN const struct sockaddr *name, + IN int namelen, + IN PVOID lpSendBuffer, + IN DWORD dwSendDataLength, + OUT LPDWORD lpdwBytesSent, + IN OUT LPOVERLAPPED lpOverlapped) +{ + UNIMPLEMENTED; + + return FALSE; +} + +BOOL +WSPAPI +WSPDisconnectEx( + IN SOCKET hSocket, + IN LPOVERLAPPED lpOverlapped, + IN DWORD dwFlags, + IN DWORD reserved) +{ + UNIMPLEMENTED; + + return FALSE; +} + +VOID +WSPAPI +WSPGetAcceptExSockaddrs( + IN PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT struct sockaddr **LocalSockaddr, + OUT LPINT LocalSockaddrLength, + OUT struct sockaddr **RemoteSockaddr, + OUT LPINT RemoteSockaddrLength) +{ + UNIMPLEMENTED; +} + /* EOF */ diff --git a/dll/win32/msafd/msafd.h b/dll/win32/msafd/msafd.h index 07ed1657fc..87b0125cc4 100644 --- a/dll/win32/msafd/msafd.h +++ b/dll/win32/msafd/msafd.h @@ -426,6 +426,48 @@ WSPStringToAddress( IN OUT LPINT lpAddressLength, OUT LPINT lpErrno); +BOOL +WSPAPI +WSPAcceptEx( + IN SOCKET sListenSocket, + IN SOCKET sAcceptSocket, + OUT PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT LPDWORD lpdwBytesReceived, + IN OUT LPOVERLAPPED lpOverlapped); + +BOOL +WSPAPI +WSPConnectEx( + IN SOCKET s, + IN const struct sockaddr *name, + IN int namelen, + IN PVOID lpSendBuffer, + IN DWORD dwSendDataLength, + OUT LPDWORD lpdwBytesSent, + IN OUT LPOVERLAPPED lpOverlapped); + +BOOL +WSPAPI +WSPDisconnectEx( + IN SOCKET hSocket, + IN LPOVERLAPPED lpOverlapped, + IN DWORD dwFlags, + IN DWORD reserved); + +VOID +WSPAPI +WSPGetAcceptExSockaddrs( + IN PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT struct sockaddr **LocalSockaddr, + OUT LPINT LocalSockaddrLength, + OUT struct sockaddr **RemoteSockaddr, + OUT LPINT RemoteSockaddrLength); PSOCKET_INFORMATION GetSocketStructure( SOCKET Handle

1 0

[reactos] 01/01: [SNDVOL32] Disable the Mute checkbox for all lines that do not have a mute switch control
by Eric Kohl 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc820b7f9f90198900727… commit cc820b7f9f9019890072772bbfb13c0ef13993ba Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 16 12:57:19 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 16 12:59:01 2019 +0100 [SNDVOL32] Disable the Mute checkbox for all lines that do not have a mute switch control --- base/applications/sndvol32/dialog.c | 39 +++++++++++++++++++++++++++++------ base/applications/sndvol32/sndvol32.c | 11 +++++++--- base/applications/sndvol32/sndvol32.h | 3 +++ 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index a93a638034..b8173ab763 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -66,13 +66,14 @@ LoadDialogResource( LPWORD AddDialogControl( IN HWND hwndDialog, - IN HWND * OutWnd, + OUT HWND *OutWnd, IN LPRECT DialogOffset, IN PDLGITEMTEMPLATE DialogItem, IN DWORD DialogIdMultiplier, IN HFONT hFont, - UINT xBaseUnit, - UINT yBaseUnit) + IN UINT xBaseUnit, + IN UINT yBaseUnit, + IN UINT MixerId) { RECT rect; LPWORD Offset; @@ -211,9 +212,23 @@ AddDialogControl( SendMessage(hwnd, TBM_SETTIC, 0, (LPARAM)i); } } - else if (!wcsicmp(ClassName, L"static") || !wcsicmp(ClassName, L"button")) + else if (!wcsicmp(ClassName, L"static")) { - /* set font */ + /* Set font */ + SendMessageW(hwnd, WM_SETFONT, (WPARAM)hFont, TRUE); + } + else if (!wcsicmp(ClassName, L"button")) + { + if (DialogItem->style & BS_AUTOCHECKBOX) + { + if (MixerId == PLAY_MIXER) + { + /* Disable checkboxes by default, if we are in play mode */ + EnableWindow(hwnd, FALSE); + } + } + + /* Set font */ SendMessageW(hwnd, WM_SETFONT, (WPARAM)hFont, TRUE); } @@ -275,7 +290,15 @@ LoadDialogControls( for (Index = 0; Index < ItemCount; Index++) { /* add controls */ - Offset = AddDialogControl(MixerWindow->hWnd, &MixerWindow->Window[MixerWindow->WindowCount], DialogOffset, DialogItem, DialogIdMultiplier, MixerWindow->hFont, xBaseUnit, yBaseUnit); + Offset = AddDialogControl(MixerWindow->hWnd, + &MixerWindow->Window[MixerWindow->WindowCount], + DialogOffset, + DialogItem, + DialogIdMultiplier, + MixerWindow->hFont, + xBaseUnit, + yBaseUnit, + MixerWindow->MixerId); /* sanity check */ assert(Offset); @@ -480,6 +503,10 @@ EnumConnectionsCallback( if (hDlgCtrl != NULL) { + /* Enable the 'Mute' checkbox, if we are in play mode */ + if (Mixer->MixerId == PLAY_MIXER) + EnableWindow(hDlgCtrl, TRUE); + /* check state */ if (SendMessageW(hDlgCtrl, BM_GETCHECK, 0, 0) != Details.fValue) { diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 011bec2f12..7f3d118369 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1328,7 +1328,7 @@ HandleCommandLine(LPTSTR cmdline, { TCHAR option; - *pMixerId = 0; + *pMixerId = PLAY_MIXER; *pMode = (dwStyle & 0x20) ? SMALL_MODE : NORMAL_MODE; while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) @@ -1348,6 +1348,11 @@ HandleCommandLine(LPTSTR cmdline, case 'D': break; + case 'n': /* Small size */ + case 'N': + *pMode = NORMAL_MODE; + break; + case 's': /* Small size */ case 'S': *pMode = SMALL_MODE; @@ -1360,12 +1365,12 @@ HandleCommandLine(LPTSTR cmdline, case 'p': /* Play mode */ case 'P': - *pMixerId = 0; + *pMixerId = PLAY_MIXER; break; case 'r': /* Record mode */ case 'R': - *pMixerId = 1; + *pMixerId = RECORD_MIXER; break; default: diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index 65fcb36176..7ff11d8485 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -25,6 +25,9 @@ #define BALANCE_TICKS 1 #define BALANCE_PAGE_SIZE 12 +#define PLAY_MIXER 0 +#define RECORD_MIXER 1 + typedef enum _WINDOW_MODE { NORMAL_MODE,

1 0

[reactos] 02/02: [E1000] Remove useless null check
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24b2d59ab6a3795122159… commit 24b2d59ab6a379512215930ed1f27c25175a6483 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 10:01:50 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 10:02:29 2019 +0100 [E1000] Remove useless null check CID 512827 --- drivers/network/dd/e1000/ndis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/network/dd/e1000/ndis.c b/drivers/network/dd/e1000/ndis.c index 2e713dfcb6..d6074cb5a2 100644 --- a/drivers/network/dd/e1000/ndis.c +++ b/drivers/network/dd/e1000/ndis.c @@ -286,10 +286,8 @@ Cleanup: { NdisFreeMemory(ResourceList, ResourceListSize, 0); } - if (Adapter != NULL) - { - MiniportHalt(Adapter); - } + + MiniportHalt(Adapter); return Status; }

1 0

[reactos] 01/02: [E1000] Don't attempt to free uninitialized pointer
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1f4d2864a100c175e5fd… commit e1f4d2864a100c175e5fd708733001a13313150c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 09:58:44 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 10:02:28 2019 +0100 [E1000] Don't attempt to free uninitialized pointer CID 1442660 --- drivers/network/dd/e1000/ndis.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/network/dd/e1000/ndis.c b/drivers/network/dd/e1000/ndis.c index f73bf5e89d..2e713dfcb6 100644 --- a/drivers/network/dd/e1000/ndis.c +++ b/drivers/network/dd/e1000/ndis.c @@ -116,6 +116,9 @@ MiniportInitialize( return NDIS_STATUS_UNSUPPORTED_MEDIA; } + ResourceList = NULL; + ResourceListSize = 0; + /* Allocate our adapter context */ Status = NdisAllocateMemoryWithTag((PVOID*)&Adapter, sizeof(*Adapter), @@ -155,10 +158,7 @@ MiniportInitialize( goto Cleanup; } - /* Get our resources for IRQ and IO base information */ - ResourceList = NULL; - ResourceListSize = 0; NdisMQueryAdapterResources(&Status, WrapperConfigurationContext, ResourceList,

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