Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [OSK] Implement "Use Click Sound" feature

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d000a1e1c6506da7c67d1… commit d000a1e1c6506da7c67d16133867fd9b1825d85a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Feb 24 16:40:02 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 1 00:13:47 2019 +0100 [OSK] Implement "Use Click Sound" feature - Implement the save/load handler for this feature - Check the "Use Click Sound" item state accordingly depending if it's enabled or disabled - Use PlaySoundW() to play the wave sound file from resource - Add the WAV sound click file. The work is made thanks to Midori Mizuno --- base/applications/osk/CMakeLists.txt | 2 +- base/applications/osk/lang/ar-DZ.rc | 2 +- base/applications/osk/lang/cs-CZ.rc | 2 +- base/applications/osk/lang/de-DE.rc | 2 +- base/applications/osk/lang/en-GB.rc | 2 +- base/applications/osk/lang/en-US.rc | 2 +- base/applications/osk/lang/es-ES.rc | 2 +- base/applications/osk/lang/et-EE.rc | 2 +- base/applications/osk/lang/fr-CA.rc | 2 +- base/applications/osk/lang/fr-FR.rc | 2 +- base/applications/osk/lang/he-IL.rc | 2 +- base/applications/osk/lang/it-IT.rc | 2 +- base/applications/osk/lang/pl-PL.rc | 2 +- base/applications/osk/lang/ro-RO.rc | 2 +- base/applications/osk/lang/ru-RU.rc | 2 +- base/applications/osk/lang/tr-TR.rc | 2 +- base/applications/osk/lang/zh-CN.rc | 2 +- base/applications/osk/lang/zh-TW.rc | 2 +- base/applications/osk/main.c | 32 ++++++++++++++++++++++++++ base/applications/osk/main.h | 1 + base/applications/osk/osk_res.h | 2 ++ base/applications/osk/res/click.wav | Bin 0 -> 20856 bytes base/applications/osk/rsrc.rc | 3 ++- base/applications/osk/settings.c | 42 ++++++++++++++++++++++++++++++++--- 24 files changed, 94 insertions(+), 22 deletions(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index 51ff4f3a42..5d5ddf76f9 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB osk_rc_deps res/*.*) add_rc_deps(rsrc.rc ${osk_rc_deps}) add_executable(osk main.c settings.c rsrc.rc) set_module_type(osk win32gui UNICODE) -add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) +add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 winmm) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index 3bf1192f0a..edd4536dd6 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 3d35fa2b47..5360c7075d 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index 6748444650..dba2dc1788 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -271,7 +271,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index 11f91b9b2f..ab04edc3a3 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -271,7 +271,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index cabdadbc6a..d955621f20 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index 4fc2284830..319fe387d0 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -272,7 +272,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index 4de3166e29..c527e7e449 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index 27c2cc78fb..18636d9614 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -271,7 +271,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index eef680d01b..ba05f9f195 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -271,7 +271,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index 5f1fa891c3..fb7977d847 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 965a73af5c..b4ba448adf 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -272,7 +272,7 @@ BEGIN BEGIN MENUITEM "Sempre in primo piano", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Usa suono al click", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Usa suono al click", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Modalità di scrittura...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index d5f7e2d30b..7e845c8cf7 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 405a163a28..f47416acbf 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -271,7 +271,7 @@ BEGIN BEGIN MENUITEM "Întotdeauna în sus", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Folosește sunetul de clic", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Folosește sunetul de clic", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Modalitatea de scriere...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index cbaafcf41b..42f6b43e35 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 3ccca25ba1..fb40d8c76b 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -270,7 +270,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index da381ed815..5f8b49ec04 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -273,7 +273,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index 3ea417a631..fbb62ff79f 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -272,7 +272,7 @@ BEGIN BEGIN MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 72cee21f30..972f8c8e9b 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -157,6 +157,12 @@ int OSK_DlgInitDialog(HWND hDlg) CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_UNCHECKED); } + /* Check if the "Click Sound" option was chosen before (and if so, then tick the menu item) */ + if (Globals.bSoundClick) + { + CheckMenuItem(GetMenu(hDlg), IDM_CLICK_SOUND, MF_BYCOMMAND | MF_CHECKED); + } + /* Set the application's icon */ hIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); hIconSm = CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); @@ -347,6 +353,12 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) SendInput(1, &Input, sizeof(Input)); } + /* Play the sound during clicking event (only if "Use Click Sound" menu option is ticked) */ + if (Globals.bSoundClick) + { + PlaySoundW(MAKEINTRESOURCEW(IDI_SOUNDCLICK), GetModuleHandle(NULL), SND_RESOURCE | SND_ASYNC); + } + return TRUE; } @@ -498,6 +510,26 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; } + case IDM_CLICK_SOUND: + { + /* + This case is triggered when the user attempts to click on the menu item. Before doing anything, + we must check the condition state of such menu item so that we can tick/untick the menu item accordingly. + */ + if (!Globals.bSoundClick) + { + Globals.bSoundClick = TRUE; + CheckMenuItem(GetMenu(hDlg), IDM_CLICK_SOUND, MF_BYCOMMAND | MF_CHECKED); + } + else + { + Globals.bSoundClick = FALSE; + CheckMenuItem(GetMenu(hDlg), IDM_CLICK_SOUND, MF_BYCOMMAND | MF_UNCHECKED); + } + + break; + } + case IDM_ABOUT: { OSK_About(); diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h index a399abadd2..137cf5b2ca 100644 --- a/base/applications/osk/main.h +++ b/base/applications/osk/main.h @@ -25,6 +25,7 @@ typedef struct HWND hActiveWnd; BOOL bShowWarning; BOOL bIsEnhancedKeyboard; + BOOL bSoundClick; } OSK_GLOBALS; /* DEFINES ********************************************************************/ diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h index 03fdffc9a7..04dd6e2b88 100644 --- a/base/applications/osk/osk_res.h +++ b/base/applications/osk/osk_res.h @@ -9,6 +9,8 @@ #define MAIN_DIALOG_ENHANCED_KB 2000 #define MAIN_DIALOG_STANDARD_KB 2001 +#define IDI_SOUNDCLICK 50 + #define IDC_LED_NUM 100 #define IDC_LED_CAPS 101 #define IDC_LED_SCROLL 102 diff --git a/base/applications/osk/res/click.wav b/base/applications/osk/res/click.wav new file mode 100644 index 0000000000..fd5402fe6b Binary files /dev/null and b/base/applications/osk/res/click.wav differ diff --git a/base/applications/osk/rsrc.rc b/base/applications/osk/rsrc.rc index 44bcd0d34c..51b4534c5a 100644 --- a/base/applications/osk/rsrc.rc +++ b/base/applications/osk/rsrc.rc @@ -21,7 +21,8 @@ #include <reactos/version.rc> -IDI_OSK ICON "res/osk.ico" +IDI_OSK ICON "res/osk.ico" +IDI_SOUNDCLICK WAVE "res/click.wav" IDI_BACK ICON "res/back.ico" diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index fa21d67d3a..03eb18f62e 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -16,12 +16,13 @@ BOOL LoadDataFromRegistry() { HKEY hKey; LONG lResult; - DWORD dwShowWarningData, dwLayout; + DWORD dwShowWarningData, dwLayout, dwSoundOnClick; DWORD cbData = sizeof(DWORD); - /* Set the structure members to TRUE */ + /* Set the structure members to TRUE (and the bSoundClick member to FALSE) */ Globals.bShowWarning = TRUE; Globals.bIsEnhancedKeyboard = TRUE; + Globals.bSoundClick = FALSE; /* Open the key, so that we can query it */ lResult = RegOpenKeyExW(HKEY_CURRENT_USER, @@ -71,6 +72,24 @@ BOOL LoadDataFromRegistry() /* Load the dialog layout value */ Globals.bIsEnhancedKeyboard = (dwLayout != 0); + + /* Query the key */ + lResult = RegQueryValueExW(hKey, + L"OnSoundClick", + 0, + 0, + (BYTE *)&dwSoundOnClick, + &cbData); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + + /* Load the sound on click value event */ + Globals.bSoundClick = (dwSoundOnClick != 0); /* If we're here then we succeed, close the key and return TRUE */ RegCloseKey(hKey); @@ -81,7 +100,7 @@ BOOL SaveDataToRegistry() { HKEY hKey; LONG lResult; - DWORD dwShowWarningData, dwLayout; + DWORD dwShowWarningData, dwLayout, dwSoundOnClick; /* If no key has been made, create one */ lResult = RegCreateKeyExW(HKEY_CURRENT_USER, @@ -134,6 +153,23 @@ BOOL SaveDataToRegistry() return FALSE; } + /* The value will be appended to the sound on click event */ + dwSoundOnClick = Globals.bSoundClick; + + lResult = RegSetValueExW(hKey, + L"OnSoundClick", + 0, + REG_DWORD, + (BYTE *)&dwSoundOnClick, + sizeof(dwSoundOnClick)); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + /* If we're here then we succeed, close the key and return TRUE */ RegCloseKey(hKey); return TRUE;

5 years, 6 months

[reactos] 03/03: [HDAUDBUS] Wait until the correct number of responses was received. CORE-15465

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1001e6089fecaa1b13c4d… commit 1001e6089fecaa1b13c4d91a162d956742c4134e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 27 15:02:38 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 28 10:27:06 2019 +0100 [HDAUDBUS] Wait until the correct number of responses was received. CORE-15465 We previously only gave the device a hard-coded amount of time to respond, which could lead to interpreting the contents of uninitialized memory as a response. This would lead to an unreasonably large number of audio function groups being detected. A KSEMAPHORE mirrors what Haiku uses here, though it may not be the optimal synchronization primitive for this case under Windows. --- drivers/wdm/audio/hdaudbus/fdo.cpp | 16 +++++++++++----- drivers/wdm/audio/hdaudbus/hdaudbus.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index a6d2ca8f11..8a08371fd2 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -129,6 +129,7 @@ HDA_DpcForIsr( /* store response */ Codec->Responses[Codec->ResponseCount] = Response; Codec->ResponseCount++; + KeReleaseSemaphore(&Codec->ResponseSemaphore, IO_NO_INCREMENT, 1, FALSE); } } @@ -167,17 +168,21 @@ HDA_SendVerbs( DeviceExtension->CorbBase[WritePosition] = Verbs[Sent++]; DeviceExtension->CorbWritePos = WritePosition; - - // FIXME HACK - // do proper synchronization - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); - KeStallExecutionProcessor(30); Queued++; } WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); } + while (Queued--) + { + KeWaitForSingleObject(&Codec->ResponseSemaphore, + Executive, + KernelMode, + FALSE, + NULL); + } + if (Responses != NULL) { memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG)); } @@ -207,6 +212,7 @@ HDA_InitCodec( /* init codec */ Entry->Addr = codecAddress; + KeInitializeSemaphore(&Entry->ResponseSemaphore, 0, MAX_CODEC_RESPONSES); /* get device extension */ DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index 6bdbc542f4..3a957c1506 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -53,6 +53,7 @@ typedef struct ULONG Responses[MAX_CODEC_RESPONSES]; ULONG ResponseCount; + KSEMAPHORE ResponseSemaphore; PHDA_CODEC_AUDIO_GROUP AudioGroups[HDA_MAX_AUDIO_GROUPS]; ULONG AudioGroupCount;

5 years, 6 months

[reactos] 02/03: [HDAUDBUS] Handle responses in a DPC instead of the ISR.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8530ae99509ae81041fdb… commit 8530ae99509ae81041fdbc98b336467a84f88243 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 27 14:34:23 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 28 10:06:18 2019 +0100 [HDAUDBUS] Handle responses in a DPC instead of the ISR. --- drivers/wdm/audio/hdaudbus/fdo.cpp | 93 ++++++++++++++++++++------------- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 1 + drivers/wdm/audio/hdaudbus/hdaudbus.h | 7 +-- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 36a6a0fa6a..a6d2ca8f11 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -13,14 +13,14 @@ HDA_InterruptService( IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { + PDEVICE_OBJECT DeviceObject; PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - ULONG InterruptStatus, Response, ResponseFlags, Cad; + ULONG InterruptStatus; UCHAR RirbStatus, CorbStatus; - USHORT WritePos; - PHDA_CODEC_ENTRY Codec; /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)ServiceContext; + DeviceObject = static_cast<PDEVICE_OBJECT>(ServiceContext); + DeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); ASSERT(DeviceExtension->IsFDO == TRUE); // Check if this interrupt is ours @@ -46,38 +46,7 @@ HDA_InterruptService( } if ((RirbStatus & RIRB_STATUS_RESPONSE) != 0) { - WritePos = (READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) + 1) % DeviceExtension->RirbLength; - - for (; DeviceExtension->RirbReadPos != WritePos; DeviceExtension->RirbReadPos = (DeviceExtension->RirbReadPos + 1) % DeviceExtension->RirbLength) - { - - Response = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].response; - ResponseFlags = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].flags; - Cad = ResponseFlags & RESPONSE_FLAGS_CODEC_MASK; - DPRINT1("Response %lx ResponseFlags %lx Cad %lx\n", Response, ResponseFlags, Cad); - - /* get codec */ - Codec = DeviceExtension->Codecs[Cad]; - if (Codec == NULL) - { - DPRINT1("hda: response for unknown codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); - continue; - } - - /* check response count */ - if (Codec->ResponseCount >= MAX_CODEC_RESPONSES) - { - DPRINT1("too many responses for codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); - continue; - } - - // FIXME handle unsolicited responses - ASSERT((ResponseFlags & RESPONSE_FLAGS_UNSOLICITED) == 0); - - /* store response */ - Codec->Responses[Codec->ResponseCount] = Response; - Codec->ResponseCount++; - } + IoRequestDpc(DeviceObject, NULL, NULL); } if ((RirbStatus & RIRB_STATUS_OVERRUN) != 0) @@ -113,6 +82,56 @@ HDA_InterruptService( return TRUE; } +VOID +NTAPI +HDA_DpcForIsr( + _In_ PKDPC Dpc, + _In_opt_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp, + _In_opt_ PVOID Context) +{ + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + ULONG Response, ResponseFlags, Cad; + USHORT WritePos; + PHDA_CODEC_ENTRY Codec; + + /* get device extension */ + DeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); + ASSERT(DeviceExtension->IsFDO == TRUE); + + WritePos = (READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) + 1) % DeviceExtension->RirbLength; + + for (; DeviceExtension->RirbReadPos != WritePos; DeviceExtension->RirbReadPos = (DeviceExtension->RirbReadPos + 1) % DeviceExtension->RirbLength) + { + Response = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].response; + ResponseFlags = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].flags; + Cad = ResponseFlags & RESPONSE_FLAGS_CODEC_MASK; + DPRINT1("Response %lx ResponseFlags %lx Cad %lx\n", Response, ResponseFlags, Cad); + + /* get codec */ + Codec = DeviceExtension->Codecs[Cad]; + if (Codec == NULL) + { + DPRINT1("hda: response for unknown codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); + continue; + } + + /* check response count */ + if (Codec->ResponseCount >= MAX_CODEC_RESPONSES) + { + DPRINT1("too many responses for codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); + continue; + } + + // FIXME handle unsolicited responses + ASSERT((ResponseFlags & RESPONSE_FLAGS_UNSOLICITED) == 0); + + /* store response */ + Codec->Responses[Codec->ResponseCount] = Response; + Codec->ResponseCount++; + } +} + VOID HDA_SendVerbs( @@ -582,7 +601,7 @@ HDA_FDOStartDevice( { Status = IoConnectInterrupt(&DeviceExtension->Interrupt, HDA_InterruptService, - (PVOID)DeviceExtension, + DeviceObject, NULL, Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index aa62a820ba..96438b786b 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -284,6 +284,7 @@ HDA_AddDevice( /* init device extension*/ DeviceExtension->IsFDO = TRUE; DeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + IoInitializeDpcRequest(DeviceObject, HDA_DpcForIsr); RtlZeroMemory(DeviceExtension->Codecs, sizeof(PHDA_CODEC_ENTRY) * (HDA_MAX_CODECS + 1)); /* set device flags */ diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index f246238cd9..6bdbc542f4 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -116,11 +116,8 @@ FreeItem( IN PVOID Item); /* fdo.cpp */ -BOOLEAN -NTAPI -HDA_InterruptService( - IN PKINTERRUPT Interrupt, - IN PVOID ServiceContext); +KSERVICE_ROUTINE HDA_InterruptService; +IO_DPC_ROUTINE HDA_DpcForIsr; NTSTATUS NTAPI

5 years, 6 months

[reactos] 01/03: [HDAUDBUS] Fix a DPRINT.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7431880bd74382fb1b35… commit a7431880bd74382fb1b35b294e16667ca2cfadbb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 27 15:02:23 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 28 10:05:53 2019 +0100 [HDAUDBUS] Fix a DPRINT. --- drivers/wdm/audio/hdaudbus/fdo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 64a0c6aef0..36a6a0fa6a 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -240,7 +240,7 @@ HDA_InitCodec( AudioGroup->FunctionGroup = FUNCTION_GROUP_NODETYPE_AUDIO; // Found an Audio Function Group! - DPRINT1("NodeId %x found an audio function group!\n"); + DPRINT1("NodeId %x found an audio function group!\n", NodeId); Status = IoCreateDevice(DeviceObject->DriverObject, sizeof(HDA_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_SOUND, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &AudioGroup->ChildPDO); if (!NT_SUCCESS(Status))

5 years, 6 months

[reactos] 01/01: [HDAUDBUS] Prevent overflow of the AudioGroups array. CORE-14153 CORE-15465

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f76fb738ae0d988f9fb0… commit 1f76fb738ae0d988f9fb0bb1006487ca15fa599e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 27 10:51:02 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Feb 27 11:04:23 2019 +0100 [HDAUDBUS] Prevent overflow of the AudioGroups array. CORE-14153 CORE-15465 This protects against crashing in case of faulty/malicious hardware, but also works around a bug in HDA_SendVerbs that causes it to return invalid data, thereby suggesting more groups than are actually present. --- drivers/wdm/audio/hdaudbus/fdo.cpp | 7 +++++++ drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 84686e3bd3..64a0c6aef0 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -222,6 +222,11 @@ HDA_InitCodec( DPRINT1("NodeId %u GroupType %x\n", NodeId, GroupType); if ((GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) { + if (Entry->AudioGroupCount >= HDA_MAX_AUDIO_GROUPS) + { + DPRINT1("Too many audio groups in node %u. Skipping.\n", NodeId); + break; + } AudioGroup = (PHDA_CODEC_AUDIO_GROUP)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_AUDIO_GROUP)); if (!AudioGroup) @@ -682,6 +687,7 @@ HDA_FDORemoveDevice( continue; } + ASSERT(CodecEntry->AudioGroupCount <= HDA_MAX_AUDIO_GROUPS); for (AFGIndex = 0; AFGIndex < CodecEntry->AudioGroupCount; AFGIndex++) { ChildPDO = CodecEntry->AudioGroups[AFGIndex]->ChildPDO; @@ -743,6 +749,7 @@ HDA_FDOQueryBusRelations( continue; Codec = DeviceExtension->Codecs[CodecIndex]; + ASSERT(Codec->AudioGroupCount <= HDA_MAX_AUDIO_GROUPS); for (AFGIndex = 0; AFGIndex < Codec->AudioGroupCount; AFGIndex++) { DeviceRelations->Objects[DeviceRelations->Count] = Codec->AudioGroups[AFGIndex]->ChildPDO; diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 3e1ef9d526..aa62a820ba 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -63,6 +63,7 @@ HDA_FdoPnp( { CodecEntry = FDODeviceExtension->Codecs[CodecIndex]; + ASSERT(CodecEntry->AudioGroupCount <= HDA_MAX_AUDIO_GROUPS); for (AFGIndex = 0; AFGIndex < CodecEntry->AudioGroupCount; AFGIndex++) { ChildDeviceExtension = static_cast<PHDA_PDO_DEVICE_EXTENSION>(CodecEntry->AudioGroups[AFGIndex]->ChildPDO->DeviceExtension);

5 years, 6 months

[reactos] 01/01: [SNDVOL32] Small Italian translation update

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8423d8b7e1938bf0838ea… commit 8423d8b7e1938bf0838ea7534fe6833365eb422e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Feb 26 15:49:47 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 26 23:04:23 2019 +0100 [SNDVOL32] Small Italian translation update --- base/applications/sndvol32/lang/it-IT.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index af0a89a380..42db02aa91 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -21,8 +21,8 @@ STRINGTABLE BEGIN IDS_SNDVOL32 "Controllo Volume" IDS_NOMIXERDEVICES "Non ci sono dispositivi mixer disponibili! Il programma si chiuderà." - IDS_SELECT "&Select" - IDS_ADVANCED_CONTROLS "Advanced Controls for %s" + IDS_SELECT "&Seleziona" + IDS_ADVANCED_CONTROLS "Controlli Avanzati per %s" IDS_OTHER_CONTROLS1 "&1 %s" IDS_OTHER_CONTROLS2 "&2 %s" END

5 years, 6 months

[reactos] 09/09: [HDAUDBUS] Implement HDA_Unload. Stub HDA_Power and HDA_SystemControl.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8414f665b00a75f488a2… commit a8414f665b00a75f488a2f51e3f375c889a8bd20 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 24 12:29:34 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 26 09:58:53 2019 +0100 [HDAUDBUS] Implement HDA_Unload. Stub HDA_Power and HDA_SystemControl. --- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 63 +++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 0202385a82..3e1ef9d526 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -8,7 +8,10 @@ #include "hdaudbus.h" DRIVER_DISPATCH HDA_Pnp; +DRIVER_DISPATCH HDA_SystemControl; +DRIVER_DISPATCH HDA_Power; DRIVER_ADD_DEVICE HDA_AddDevice; +DRIVER_UNLOAD HDA_Unload; extern "C" DRIVER_INITIALIZE DriverEntry; PVOID @@ -206,6 +209,55 @@ HDA_Pnp( } } +NTSTATUS +NTAPI +HDA_SystemControl( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + NTSTATUS Status; + PHDA_FDO_DEVICE_EXTENSION FDODeviceExtension; + + FDODeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); + + if (FDODeviceExtension->IsFDO) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->LowerDevice, Irp); + } + else + { + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + +NTSTATUS +NTAPI +HDA_Power( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + NTSTATUS Status; + PHDA_FDO_DEVICE_EXTENSION FDODeviceExtension; + + FDODeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); + + if (FDODeviceExtension->IsFDO) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(FDODeviceExtension->LowerDevice, Irp); + } + else + { + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} NTSTATUS NTAPI @@ -238,6 +290,14 @@ HDA_AddDevice( return Status; } + +VOID +NTAPI +HDA_Unload( + _In_ PDRIVER_OBJECT DriverObject) +{ +} + extern "C" { NTSTATUS @@ -246,7 +306,10 @@ DriverEntry( _In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPathName) { + DriverObject->DriverUnload = HDA_Unload; DriverObject->DriverExtension->AddDevice = HDA_AddDevice; + DriverObject->MajorFunction[IRP_MJ_POWER] = HDA_Power; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HDA_SystemControl; DriverObject->MajorFunction[IRP_MJ_PNP] = HDA_Pnp; return STATUS_SUCCESS;

5 years, 6 months

[reactos] 08/09: [HDAUDBUS] Correctly mask register values.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25b22131ca5f30a81f6d8… commit 25b22131ca5f30a81f6d827f1fe480ce33aa4103 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Feb 25 01:56:25 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 26 09:51:48 2019 +0100 [HDAUDBUS] Correctly mask register values. See https://github.com/haiku/haiku/blob/master/src/add-ons/kernel/drivers/audio… and https://github.com/haiku/haiku/blob/master/src/add-ons/kernel/drivers/audio… This fixes various device reset failures and probably other issues. --- drivers/wdm/audio/hdaudbus/fdo.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index a14b5b9dda..84686e3bd3 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -285,19 +285,19 @@ HDA_InitCorbRirbPos( if ((corbSize & CORB_SIZE_CAP_256_ENTRIES) != 0) { DeviceExtension->CorbLength = 256; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & ~HDAC_CORB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_256_ENTRIES); } else if (corbSize & CORB_SIZE_CAP_16_ENTRIES) { DeviceExtension->CorbLength = 16; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & ~HDAC_CORB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_16_ENTRIES); } else if (corbSize & CORB_SIZE_CAP_2_ENTRIES) { DeviceExtension->CorbLength = 2; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & ~HDAC_CORB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_2_ENTRIES); } @@ -306,19 +306,19 @@ HDA_InitCorbRirbPos( if (rirbSize & RIRB_SIZE_CAP_256_ENTRIES) { DeviceExtension->RirbLength = 256; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & ~HDAC_RIRB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_256_ENTRIES); } else if (rirbSize & RIRB_SIZE_CAP_16_ENTRIES) { DeviceExtension->RirbLength = 16; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & ~HDAC_RIRB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_16_ENTRIES); } else if (rirbSize & RIRB_SIZE_CAP_2_ENTRIES) { DeviceExtension->RirbLength = 2; - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & ~HDAC_RIRB_SIZE_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_2_ENTRIES); } @@ -349,7 +349,7 @@ HDA_InitCorbRirbPos( WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_LOWER), CorbPhysicalAddress.LowPart); WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_UPPER), CorbPhysicalAddress.HighPart); - value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS)) & HDAC_CORB_WRITE_POS_MASK; + value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS)) & ~HDAC_CORB_WRITE_POS_MASK; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), value); // Reset CORB read pointer. Preserve bits marked as RsvdP. @@ -392,11 +392,11 @@ HDA_InitCorbRirbPos( } // Reset RIRB write pointer - rirbWritePointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) & RIRB_WRITE_POS_RESET; + rirbWritePointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) & ~RIRB_WRITE_POS_RESET; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS), rirbWritePointer | RIRB_WRITE_POS_RESET); // Generate interrupt for every response - interruptValue = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT)) & HDAC_RESPONSE_INTR_COUNT_MASK; + interruptValue = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT)) & ~HDAC_RESPONSE_INTR_COUNT_MASK; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT), interruptValue | 1); // Setup cached read/write indices @@ -404,10 +404,10 @@ HDA_InitCorbRirbPos( DeviceExtension->CorbWritePos = 0; // Gentlemen, start your engines... - corbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL)) &HDAC_CORB_CONTROL_MASK; + corbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL)) & ~HDAC_CORB_CONTROL_MASK; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL), corbControl | CORB_CONTROL_RUN | CORB_CONTROL_MEMORY_ERROR_INTR); - rirbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL)) & HDAC_RIRB_CONTROL_MASK; + rirbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL)) & ~HDAC_RIRB_CONTROL_MASK; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL), rirbControl | RIRB_CONTROL_DMA_ENABLE | RIRB_CONTROL_OVERRUN_INTR | RIRB_CONTROL_RESPONSE_INTR); return STATUS_SUCCESS; @@ -456,10 +456,10 @@ HDA_ResetController( } // stop DMA - Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL) & HDAC_CORB_CONTROL_MASK; + Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL) & ~HDAC_CORB_CONTROL_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL, Control); - Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL) & HDAC_RIRB_CONTROL_MASK; + Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL) & ~HDAC_RIRB_CONTROL_MASK; WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL, Control); for (int timeout = 0; timeout < 10; timeout++) {

5 years, 6 months

[reactos] 07/09: [HDAUDBUS] Implement PDO removal. CORE-14617

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=584baf79d935a95987ac5… commit 584baf79d935a95987ac5752566185912968f81c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Feb 25 13:47:14 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 26 09:51:38 2019 +0100 [HDAUDBUS] Implement PDO removal. CORE-14617 --- drivers/wdm/audio/hdaudbus/fdo.cpp | 14 ++++++++++++++ drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 23 +++++++++++++++++++++++ drivers/wdm/audio/hdaudbus/hdaudbus.h | 5 +++++ drivers/wdm/audio/hdaudbus/pdo.cpp | 22 ++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 44e41d22c1..a14b5b9dda 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -248,6 +248,7 @@ HDA_InitCodec( /* init child pdo*/ ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)AudioGroup->ChildPDO->DeviceExtension; ChildDeviceExtension->IsFDO = FALSE; + ChildDeviceExtension->ReportedMissing = FALSE; ChildDeviceExtension->Codec = Entry; ChildDeviceExtension->AudioGroup = AudioGroup; ChildDeviceExtension->FDO = DeviceObject; @@ -646,6 +647,8 @@ HDA_FDORemoveDevice( PHDA_FDO_DEVICE_EXTENSION DeviceExtension; ULONG CodecIndex, AFGIndex; PHDA_CODEC_ENTRY CodecEntry; + PDEVICE_OBJECT ChildPDO; + PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; /* get device extension */ DeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); @@ -670,6 +673,7 @@ HDA_FDORemoveDevice( { MmFreeContiguousMemory(DeviceExtension->CorbBase); } + for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) { CodecEntry = DeviceExtension->Codecs[CodecIndex]; @@ -680,6 +684,16 @@ HDA_FDORemoveDevice( for (AFGIndex = 0; AFGIndex < CodecEntry->AudioGroupCount; AFGIndex++) { + ChildPDO = CodecEntry->AudioGroups[AFGIndex]->ChildPDO; + if (ChildPDO != NULL) + { + ChildDeviceExtension = static_cast<PHDA_PDO_DEVICE_EXTENSION>(ChildPDO->DeviceExtension); + ChildDeviceExtension->Codec = NULL; + ChildDeviceExtension->AudioGroup = NULL; + ChildDeviceExtension->FDO = NULL; + ChildDeviceExtension->ReportedMissing = TRUE; + HDA_PDORemoveDevice(ChildPDO); + } FreeItem(CodecEntry->AudioGroups[AFGIndex]); } FreeItem(CodecEntry); diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 79b07463b8..0202385a82 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -39,6 +39,9 @@ HDA_FdoPnp( NTSTATUS Status; PIO_STACK_LOCATION IoStack; PHDA_FDO_DEVICE_EXTENSION FDODeviceExtension; + ULONG CodecIndex, AFGIndex; + PHDA_CODEC_ENTRY CodecEntry; + PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; FDODeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -52,6 +55,19 @@ HDA_FdoPnp( return Status; case IRP_MN_REMOVE_DEVICE: return HDA_FDORemoveDevice(DeviceObject, Irp); + case IRP_MN_SURPRISE_REMOVAL: + for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) + { + CodecEntry = FDODeviceExtension->Codecs[CodecIndex]; + + for (AFGIndex = 0; AFGIndex < CodecEntry->AudioGroupCount; AFGIndex++) + { + ChildDeviceExtension = static_cast<PHDA_PDO_DEVICE_EXTENSION>(CodecEntry->AudioGroups[AFGIndex]->ChildPDO->DeviceExtension); + ChildDeviceExtension->ReportedMissing = TRUE; + } + } + Irp->IoStatus.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: Irp->IoStatus.Status = STATUS_SUCCESS; @@ -92,6 +108,13 @@ HDA_PdoPnp( /* no op for pdo */ Status = STATUS_SUCCESS; break; + case IRP_MN_REMOVE_DEVICE: + Status = HDA_PDORemoveDevice(DeviceObject); + break; + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_BUS_INFORMATION: /* query bus information */ Status = HDA_PDOQueryBusInformation(Irp); diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index f29aae5919..f246238cd9 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -84,6 +84,7 @@ typedef struct typedef struct { BOOLEAN IsFDO; + BOOLEAN ReportedMissing; PHDA_CODEC_ENTRY Codec; PHDA_CODEC_AUDIO_GROUP AudioGroup; PDEVICE_OBJECT FDO; @@ -149,6 +150,10 @@ HDA_SendVerbs( /* pdo.cpp*/ +NTSTATUS +HDA_PDORemoveDevice( + _In_ PDEVICE_OBJECT DeviceObject); + NTSTATUS HDA_PDOQueryBusInformation( IN PIRP Irp); diff --git a/drivers/wdm/audio/hdaudbus/pdo.cpp b/drivers/wdm/audio/hdaudbus/pdo.cpp index b0e3c4f51c..f93c6fa168 100644 --- a/drivers/wdm/audio/hdaudbus/pdo.cpp +++ b/drivers/wdm/audio/hdaudbus/pdo.cpp @@ -7,6 +7,28 @@ */ #include "hdaudbus.h" +NTSTATUS +HDA_PDORemoveDevice( + _In_ PDEVICE_OBJECT DeviceObject) +{ + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = static_cast<PHDA_PDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); + ASSERT(DeviceExtension->IsFDO == FALSE); + + if (DeviceExtension->ReportedMissing) + { + if (DeviceExtension->AudioGroup != NULL) + { + DeviceExtension->AudioGroup->ChildPDO = NULL; + } + IoDeleteDevice(DeviceObject); + } + + return STATUS_SUCCESS; +} + NTSTATUS HDA_PDOQueryBusInformation( IN PIRP Irp)

5 years, 6 months

[reactos] 06/09: [HDAUDBUS] Implement FDO removal. CORE-14617

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8c0fc8d643bac8c0caa3… commit c8c0fc8d643bac8c0caa320c98d18a7160ec0ad4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 24 14:33:41 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Feb 26 09:51:21 2019 +0100 [HDAUDBUS] Implement FDO removal. CORE-14617 --- drivers/wdm/audio/hdaudbus/fdo.cpp | 55 +++++++++++++++++++++++++++++++++ drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 6 ++++ drivers/wdm/audio/hdaudbus/hdaudbus.h | 9 +++++- 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 3df33c907b..44e41d22c1 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -563,6 +563,7 @@ HDA_FDOStartDevice( if (Descriptor->Type == CmResourceTypeMemory) { + DeviceExtension->RegLength = Descriptor->u.Memory.Length; DeviceExtension->RegBase = (PUCHAR)MmMapIoSpace(Descriptor->u.Memory.Start, Descriptor->u.Memory.Length, MmNonCached); if (DeviceExtension->RegBase == NULL) { @@ -635,6 +636,60 @@ HDA_FDOStartDevice( return Status; } +NTSTATUS +NTAPI +HDA_FDORemoveDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + NTSTATUS Status; + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + ULONG CodecIndex, AFGIndex; + PHDA_CODEC_ENTRY CodecEntry; + + /* get device extension */ + DeviceExtension = static_cast<PHDA_FDO_DEVICE_EXTENSION>(DeviceObject->DeviceExtension); + ASSERT(DeviceExtension->IsFDO == TRUE); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->LowerDevice, Irp); + + IoDetachDevice(DeviceExtension->LowerDevice); + + if (DeviceExtension->RegBase != NULL) + { + MmUnmapIoSpace(DeviceExtension->RegBase, + DeviceExtension->RegLength); + } + if (DeviceExtension->Interrupt != NULL) + { + IoDisconnectInterrupt(DeviceExtension->Interrupt); + } + if (DeviceExtension->CorbBase != NULL) + { + MmFreeContiguousMemory(DeviceExtension->CorbBase); + } + for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) + { + CodecEntry = DeviceExtension->Codecs[CodecIndex]; + if (CodecEntry == NULL) + { + continue; + } + + for (AFGIndex = 0; AFGIndex < CodecEntry->AudioGroupCount; AFGIndex++) + { + FreeItem(CodecEntry->AudioGroups[AFGIndex]); + } + FreeItem(CodecEntry); + } + + IoDeleteDevice(DeviceObject); + + return Status; +} + NTSTATUS NTAPI HDA_FDOQueryBusRelations( diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 440d75ae58..79b07463b8 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -50,6 +50,12 @@ HDA_FdoPnp( Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; + case IRP_MN_REMOVE_DEVICE: + return HDA_FDORemoveDevice(DeviceObject, Irp); + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + Irp->IoStatus.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_DEVICE_RELATIONS: /* handle bus device relations */ if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index fa7f04a70a..f29aae5919 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -64,8 +64,9 @@ typedef struct { BOOLEAN IsFDO; PDEVICE_OBJECT LowerDevice; - + PUCHAR RegBase; + SIZE_T RegLength; PKINTERRUPT Interrupt; ULONG CorbLength; @@ -126,6 +127,12 @@ HDA_FDOStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +NTAPI +HDA_FDORemoveDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp); + NTSTATUS NTAPI HDA_FDOQueryBusRelations(

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2019