[SNDVOL32]

- revert 67251 as it breaks the dynamic user interface
[KS]
- fix bugs to return pin / topology node names

svn path=/trunk/; revision=67952

diff --git a/reactos/base/applications/sndvol32/lang/bg-BG.rc b/reactos/base/applications/sndvol32/lang/bg-BG.rc
index 716e03a..4bd1fab 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/bg-BG.rc
+++ b/reactos/base/applications/sndvol32/lang/bg-BG.rc
@@ -45,8 +45,8 @@ BEGIN
     PUSHBUTTON "Отказ", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Обща", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/cs-CZ.rc b/reactos/base/applications/sndvol32/lang/cs-CZ.rc
index 5a70f63..be0dd0c 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/cs-CZ.rc
+++ b/reactos/base/applications/sndvol32/lang/cs-CZ.rc
@@ -47,8 +47,8 @@ BEGIN
     PUSHBUTTON "Storno", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/de-DE.rc b/reactos/base/applications/sndvol32/lang/de-DE.rc
index 703bd24..7d36e8d 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/de-DE.rc
+++ b/reactos/base/applications/sndvol32/lang/de-DE.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Abbrechen", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/el-GR.rc b/reactos/base/applications/sndvol32/lang/el-GR.rc
index b756bb7..7265a3f 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/el-GR.rc
+++ b/reactos/base/applications/sndvol32/lang/el-GR.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Άκυρο", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/en-US.rc b/reactos/base/applications/sndvol32/lang/en-US.rc
index 901c167..e7774a9 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/en-US.rc
+++ b/reactos/base/applications/sndvol32/lang/en-US.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/es-ES.rc b/reactos/base/applications/sndvol32/lang/es-ES.rc
index c0d1f8e..8ba4fc4 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/es-ES.rc
+++ b/reactos/base/applications/sndvol32/lang/es-ES.rc
@@ -44,8 +44,8 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Principal", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/fr-FR.rc b/reactos/base/applications/sndvol32/lang/fr-FR.rc
index 85756ef..977f166 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/fr-FR.rc
+++ b/reactos/base/applications/sndvol32/lang/fr-FR.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Annuler", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/he-IL.rc b/reactos/base/applications/sndvol32/lang/he-IL.rc
index f11dbe5..7f7c024 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/he-IL.rc
+++ b/reactos/base/applications/sndvol32/lang/he-IL.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "ביטול", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/hu-HU.rc b/reactos/base/applications/sndvol32/lang/hu-HU.rc
index 8c6bf31..373c1d5 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/hu-HU.rc
+++ b/reactos/base/applications/sndvol32/lang/hu-HU.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Mégse", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/id-ID.rc b/reactos/base/applications/sndvol32/lang/id-ID.rc
index 9230c80..3612ab0 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/id-ID.rc
+++ b/reactos/base/applications/sndvol32/lang/id-ID.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Batal", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/it-IT.rc b/reactos/base/applications/sndvol32/lang/it-IT.rc
index c834853..6794625 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/it-IT.rc
+++ b/reactos/base/applications/sndvol32/lang/it-IT.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Annulla", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/ja-JP.rc b/reactos/base/applications/sndvol32/lang/ja-JP.rc
index e2b181c..c57639b 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/ja-JP.rc
+++ b/reactos/base/applications/sndvol32/lang/ja-JP.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "キャンセル", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 9, "MS UI Gothic"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/ko-KR.rc b/reactos/base/applications/sndvol32/lang/ko-KR.rc
index f162d44..833a994 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/ko-KR.rc
+++ b/reactos/base/applications/sndvol32/lang/ko-KR.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "취소", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/lt-LT.rc b/reactos/base/applications/sndvol32/lang/lt-LT.rc
index ea65bbb..e241dc5 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/lt-LT.rc
+++ b/reactos/base/applications/sndvol32/lang/lt-LT.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Atsisakyti", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/nl-NL.rc b/reactos/base/applications/sndvol32/lang/nl-NL.rc
index 4bf3870..e89e20e 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/nl-NL.rc
+++ b/reactos/base/applications/sndvol32/lang/nl-NL.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Annuleren", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/no-NO.rc b/reactos/base/applications/sndvol32/lang/no-NO.rc
index c6e2b93..8634227 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/no-NO.rc
+++ b/reactos/base/applications/sndvol32/lang/no-NO.rc
@@ -41,8 +41,8 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/pl-PL.rc b/reactos/base/applications/sndvol32/lang/pl-PL.rc
index 47ca298..05cfbbe 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/pl-PL.rc
+++ b/reactos/base/applications/sndvol32/lang/pl-PL.rc
@@ -49,8 +49,8 @@ BEGIN
     PUSHBUTTON "Anuluj", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Kanał główny", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/pt-BR.rc b/reactos/base/applications/sndvol32/lang/pt-BR.rc
index 0f4dbf0..54582e2 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/pt-BR.rc
+++ b/reactos/base/applications/sndvol32/lang/pt-BR.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/ro-RO.rc b/reactos/base/applications/sndvol32/lang/ro-RO.rc
index 2968d2d..831323b 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/ro-RO.rc
+++ b/reactos/base/applications/sndvol32/lang/ro-RO.rc
@@ -42,8 +42,8 @@ BEGIN
     PUSHBUTTON "A&nulează", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Volum general", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/ru-RU.rc b/reactos/base/applications/sndvol32/lang/ru-RU.rc
index dc21a78..7ed3617 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/ru-RU.rc
+++ b/reactos/base/applications/sndvol32/lang/ru-RU.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Отмена", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Главная", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/sk-SK.rc b/reactos/base/applications/sndvol32/lang/sk-SK.rc
index 3681c6a..8e062cf 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/sk-SK.rc
+++ b/reactos/base/applications/sndvol32/lang/sk-SK.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Zrušiť", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/sq-AL.rc b/reactos/base/applications/sndvol32/lang/sq-AL.rc
index 3c49095..ee3089f 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/sq-AL.rc
+++ b/reactos/base/applications/sndvol32/lang/sq-AL.rc
@@ -45,8 +45,8 @@ BEGIN
     PUSHBUTTON "Anulo", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/sv-SE.rc b/reactos/base/applications/sndvol32/lang/sv-SE.rc
index 3e15b6e..f0159ef 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/sv-SE.rc
+++ b/reactos/base/applications/sndvol32/lang/sv-SE.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Huvud", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/th-TH.rc b/reactos/base/applications/sndvol32/lang/th-TH.rc
index e48573b..90f19d4 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/th-TH.rc
+++ b/reactos/base/applications/sndvol32/lang/th-TH.rc
@@ -49,8 +49,8 @@ BEGIN
     PUSHBUTTON "ยกเลิก", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/tr-TR.rc b/reactos/base/applications/sndvol32/lang/tr-TR.rc
index fcd20f8..97fac2a 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/tr-TR.rc
+++ b/reactos/base/applications/sndvol32/lang/tr-TR.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Ana", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/uk-UA.rc b/reactos/base/applications/sndvol32/lang/uk-UA.rc
index 2128a3c..f5001c5 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/uk-UA.rc
+++ b/reactos/base/applications/sndvol32/lang/uk-UA.rc
@@ -49,8 +49,8 @@ BEGIN
     PUSHBUTTON "Скасувати", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Головна", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/zh-CN.rc b/reactos/base/applications/sndvol32/lang/zh-CN.rc
index 520b23e..5bad83a 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/zh-CN.rc
+++ b/reactos/base/applications/sndvol32/lang/zh-CN.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/base/applications/sndvol32/lang/zh-TW.rc b/reactos/base/applications/sndvol32/lang/zh-TW.rc
index c84bf05..2979969 100644 (file)
--- a/reactos/base/applications/sndvol32/lang/zh-TW.rc
+++ b/reactos/base/applications/sndvol32/lang/zh-TW.rc
@@ -43,8 +43,8 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14
 END
 
-IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150
-STYLE DS_SHELLFONT | WS_POPUP | WS_BORDER
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
 FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15

diff --git a/reactos/drivers/ksfilter/ks/connectivity.c b/reactos/drivers/ksfilter/ks/connectivity.c
index 2cef41f..cdfb984 100644 (file)
--- a/reactos/drivers/ksfilter/ks/connectivity.c
+++ b/reactos/drivers/ksfilter/ks/connectivity.c
@@ -579,10 +579,10 @@ KspPinPropertyHandler(
             }
 
             /* copy result */
-            RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength);
+            RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, &KeyInfo->Data, KeyInfo->DataLength);
 
             /* null terminate name */
-            ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0';
+            ((LPWSTR)Irp->AssociatedIrp.SystemBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0';
 
             /* free key info */
             FreeItem(KeyInfo);

diff --git a/reactos/drivers/ksfilter/ks/topology.c b/reactos/drivers/ksfilter/ks/topology.c
index 2785a9b..4a24120 100644 (file)
--- a/reactos/drivers/ksfilter/ks/topology.c
+++ b/reactos/drivers/ksfilter/ks/topology.c
@@ -220,10 +220,10 @@ KsTopologyPropertyHandler(
             }
 
             /* copy result buffer */
-            RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength);
+            RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, &KeyInfo->Data, KeyInfo->DataLength);
 
             /* zero terminate it */
-            ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0';
+            ((LPWSTR)Irp->AssociatedIrp.SystemBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0';
 
             /* free key info */
             FreeItem(KeyInfo);
@@ -234,7 +234,7 @@ KsTopologyPropertyHandler(
            Status = STATUS_NOT_FOUND;
     }
 
-
+    Irp->IoStatus.Status = Status;
     return Status;
 }