Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [SNDVOL32] Implement the dialog resize code for the 'Advanced Controls' menu item and prepare for clicks on the 'Advanced' button.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95ed44ef63d767a2bda03… commit 95ed44ef63d767a2bda03fef455b795526f265aa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 18 00:58:28 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 18 00:58:28 2019 +0100 [SNDVOL32] Implement the dialog resize code for the 'Advanced Controls' menu item and prepare for clicks on the 'Advanced' button. --- base/applications/sndvol32/dialog.c | 52 ++++++++++++++-- base/applications/sndvol32/sndvol32.c | 108 +++++++--------------------------- base/applications/sndvol32/sndvol32.h | 2 + 3 files changed, 69 insertions(+), 93 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index d14a324098..f0d5d39a84 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -631,7 +631,19 @@ EnumConnectionsCallback( else { if (PrefContext->MixerWindow->Mode == NORMAL_MODE) + { PrefContext->MixerWindow->bHasExtendedControls = TRUE; + + wID = (PrefContext->MixerWindow->DialogCount + 1) * IDC_LINE_ADVANCED; + + /* get dialog control */ + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); + if (hDlgCtrl != NULL) + { + ShowWindow(hDlgCtrl, + PrefContext->MixerWindow->bShowExtendedControls ? SW_SHOWNORMAL : SW_HIDE); + } + } } } @@ -658,26 +670,34 @@ LoadDialogCtrls( { HWND hDlgCtrl; RECT statusRect; + UINT i; + LONG dy; /* set dialog count to zero */ PrefContext->MixerWindow->DialogCount = 0; - + PrefContext->MixerWindow->bHasExtendedControls = FALSE; SetRectEmpty(&PrefContext->MixerWindow->rect); /* enumerate controls */ SndMixerEnumConnections(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, EnumConnectionsCallback, (PVOID)PrefContext); - if (PrefContext->MixerWindow->bHasExtendedControls) - { - EnableMenuItem(GetMenu(PrefContext->MixerWindow->hWnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_ENABLED); - } + /* Update the 'Advanced Controls' menu item */ + EnableMenuItem(GetMenu(PrefContext->MixerWindow->hWnd), + IDM_ADVANCED_CONTROLS, + MF_BYCOMMAND | (PrefContext->MixerWindow->bHasExtendedControls ? MF_ENABLED : MF_GRAYED)); + /* Add some height for the status bar */ if (PrefContext->MixerWindow->hStatusBar) { GetWindowRect(PrefContext->MixerWindow->hStatusBar, &statusRect); PrefContext->MixerWindow->rect.bottom += (statusRect.bottom - statusRect.top); } + /* Add height of the 'Advanced' button */ + dy = MulDiv(ADVANCED_BUTTON_HEIGHT, PrefContext->MixerWindow->baseUnit.cy, 8); + if (PrefContext->MixerWindow->bShowExtendedControls && PrefContext->MixerWindow->bHasExtendedControls) + PrefContext->MixerWindow->rect.bottom += dy; + /* now move the window */ AdjustWindowRect(&PrefContext->MixerWindow->rect, WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, TRUE); SetWindowPos(PrefContext->MixerWindow->hWnd, HWND_TOP, PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.top, PrefContext->MixerWindow->rect.right - PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.bottom - PrefContext->MixerWindow->rect.top, SWP_NOMOVE | SWP_NOZORDER); @@ -694,8 +714,28 @@ LoadDialogCtrls( SWP_NOZORDER); } + /* Resize the vertical line separators */ + for (i = 0; i < PrefContext->MixerWindow->DialogCount; i++) + { + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, (i + 1) * IDC_LINE_SEP); + if (hDlgCtrl != NULL) + { + GetWindowRect(hDlgCtrl, &statusRect); + if (PrefContext->MixerWindow->bShowExtendedControls && PrefContext->MixerWindow->bHasExtendedControls) + statusRect.bottom += dy; + + SetWindowPos(hDlgCtrl, + HWND_TOP, + 0, + 0, + statusRect.right - statusRect.left, + statusRect.bottom - statusRect.top, + SWP_NOMOVE | SWP_NOZORDER); + } + } + /* Hide the last line separator */ - hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->MixerWindow->DialogCount /*PrefContext->Count*/); + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->MixerWindow->DialogCount); if (hDlgCtrl != NULL) { ShowWindow(hDlgCtrl, SW_HIDE); diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index bfb640981c..5e9616d67e 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -873,78 +873,6 @@ done: return TRUE; } - -static VOID -ResizeMixerWindow( - PMIXER_WINDOW MixerWindow) -{ - RECT statusRect; - HWND hDlgCtrl; - UINT i; - LONG dy; - - if (MixerWindow->Mode != NORMAL_MODE) - return; - - if (MixerWindow->bHasExtendedControls == FALSE) - return; - - if (MixerWindow->hStatusBar) - { - GetWindowRect(MixerWindow->hStatusBar, &statusRect); - } - - /* Height of the 'Advanced' button in dialog units plus 2 units bottom space */ - #define BUTTON_HEIGHT 16 - dy = MulDiv(BUTTON_HEIGHT, MixerWindow->baseUnit.cy, 8); - - if (MixerWindow->bShowExtendedControls) - MixerWindow->rect.bottom += dy; - else - MixerWindow->rect.bottom -= dy; - - SetWindowPos(MixerWindow->hWnd, - HWND_TOP, - MixerWindow->rect.left, - MixerWindow->rect.top, - MixerWindow->rect.right - MixerWindow->rect.left, - MixerWindow->rect.bottom - MixerWindow->rect.top, - SWP_NOMOVE | SWP_NOZORDER); - - if (MixerWindow->hStatusBar) - { - SetWindowPos(MixerWindow->hStatusBar, - HWND_TOP, - statusRect.left, - MixerWindow->rect.bottom - (statusRect.bottom - statusRect.top), - MixerWindow->rect.right - MixerWindow->rect.left, - statusRect.bottom - statusRect.top, - SWP_NOZORDER); - } - - for (i = 0; i < MixerWindow->DialogCount; i++) - { - hDlgCtrl = GetDlgItem(MixerWindow->hWnd, IDC_LINE_SEP * i); - if (hDlgCtrl != NULL) - { - GetWindowRect(hDlgCtrl, &statusRect); - if (MixerWindow->bShowExtendedControls) - statusRect.bottom += dy; - else - statusRect.bottom -= dy; - - SetWindowPos(hDlgCtrl, - HWND_TOP, - 0, - 0, - statusRect.right - statusRect.left, - statusRect.bottom - statusRect.top, - SWP_NOMOVE | SWP_NOZORDER); - } - } -} - - static LRESULT CALLBACK MainWindowProc(HWND hwnd, UINT uMsg, @@ -1037,7 +965,7 @@ MainWindowProc(HWND hwnd, CheckMenuItem(GetMenu(hwnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | (MixerWindow->bShowExtendedControls ? MF_CHECKED : MF_UNCHECKED)); - ResizeMixerWindow(MixerWindow); + RebuildMixerWindowControls(&Preferences); break; case IDM_EXIT: @@ -1063,28 +991,34 @@ MainWindowProc(HWND hwnd, CtrlID = LOWORD(wParam); /* check if the message is from the line switch */ - if (HIWORD(wParam) == BN_CLICKED && (CtrlID % IDC_LINE_SWITCH == 0)) + if (HIWORD(wParam) == BN_CLICKED) { - /* compute line offset */ - LineOffset = CtrlID / IDC_LINE_SWITCH; + if (CtrlID % IDC_LINE_SWITCH == 0) + { + /* compute line offset */ + LineOffset = CtrlID / IDC_LINE_SWITCH; + + /* compute window id of line name static control */ + CtrlID = LineOffset * IDC_LINE_NAME; - /* compute window id of line name static control */ - CtrlID = LineOffset * IDC_LINE_NAME; + /* get line name */ + if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) + { + /* setup context */ + Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + Context.bVertical = FALSE; + Context.bSwitch = TRUE; - /* get line name */ - if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) + /* set volume */ + SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); + } + } + else if (CtrlID % IDC_LINE_ADVANCED == 0) { - /* setup context */ - Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); - Context.bVertical = FALSE; - Context.bSwitch = TRUE; - /* set volume */ - SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); } } } - } break; } diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index 0e9a0ffd1f..201e4f0e18 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -28,6 +28,8 @@ #define PLAY_MIXER 0 #define RECORD_MIXER 1 +#define ADVANCED_BUTTON_HEIGHT 16 + typedef enum _WINDOW_MODE { NORMAL_MODE,

5 years, 7 months

[reactos] 01/01: [SNDVOL32] Fix the window height issue when the line selection changes and implement the 'Advanced Controls' menu item.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe5c50e1820351e4bfcb8… commit fe5c50e1820351e4bfcb8c136e5cab06c3eb8a2b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 17 14:04:39 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 17 14:04:39 2019 +0100 [SNDVOL32] Fix the window height issue when the line selection changes and implement the 'Advanced Controls' menu item. CORE-9108 CORE-15751 --- base/applications/sndvol32/dialog.c | 55 ++++++++++++----- 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 | 3 +- base/applications/sndvol32/sndvol32.c | 103 +++++++++++++++++++++++++++---- base/applications/sndvol32/sndvol32.h | 5 +- 32 files changed, 305 insertions(+), 141 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 9aed047faf..d14a324098 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -225,7 +225,7 @@ AddDialogControl( } else if (!wcsicmp(ClassName, L"button")) { - if (DialogItem->style & BS_AUTOCHECKBOX) + if (DialogItem->id == IDC_LINE_SWITCH) { if (MixerId == PLAY_MIXER) { @@ -233,13 +233,15 @@ AddDialogControl( EnableWindow(hwnd, FALSE); } } + else if (DialogItem->id == IDC_LINE_ADVANCED) + { + ShowWindow(hwnd, SW_HIDE); + } /* Set font */ SendMessageW(hwnd, WM_SETFONT, (WPARAM)hFont, TRUE); } - //ShowWindow(hwnd, SW_SHOWNORMAL); - if (WindowName != NULL) { /* move offset past window name */ @@ -396,6 +398,9 @@ LoadDialog( yBaseUnit = charSize.cy; } SelectObject(hDC, hOldFont); + + MixerWindow->baseUnit.cx = charSize.cx; + MixerWindow->baseUnit.cy = charSize.cy; } } @@ -480,10 +485,10 @@ EnumConnectionsCallback( dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_LINE : IDD_NORMAL_LINE; /* load dialog resource */ - LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(dlgId), PrefContext->Count); + LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(dlgId), PrefContext->MixerWindow->DialogCount); /* get id */ - wID = (PrefContext->Count + 1) * IDC_LINE_NAME; + wID = (PrefContext->MixerWindow->DialogCount + 1) * IDC_LINE_NAME; /* set line name */ SetDlgItemTextW(PrefContext->MixerWindow->hWnd, wID, Line->szName); @@ -502,7 +507,7 @@ EnumConnectionsCallback( if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1) { /* update dialog control */ - wID = (PrefContext->Count + 1) * IDC_LINE_SWITCH; + wID = (PrefContext->MixerWindow->DialogCount + 1) * IDC_LINE_SWITCH; /* get dialog control */ hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); @@ -578,7 +583,7 @@ EnumConnectionsCallback( } /* Set the volume trackbar */ - wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_VERT; + wID = (PrefContext->MixerWindow->DialogCount + 1) * IDC_LINE_SLIDER_VERT; /* get dialog control */ hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); @@ -601,7 +606,7 @@ EnumConnectionsCallback( if (Line->cChannels == 2) { /* Set the balance trackbar */ - wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; + wID = (PrefContext->MixerWindow->DialogCount + 1) * IDC_LINE_SLIDER_HORZ; /* get dialog control */ hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); @@ -623,6 +628,11 @@ EnumConnectionsCallback( } } } + else + { + if (PrefContext->MixerWindow->Mode == NORMAL_MODE) + PrefContext->MixerWindow->bHasExtendedControls = TRUE; + } } /* free controls */ @@ -630,7 +640,7 @@ EnumConnectionsCallback( } /* increment dialog count */ - PrefContext->Count++; + PrefContext->MixerWindow->DialogCount++; } } @@ -650,13 +660,18 @@ LoadDialogCtrls( RECT statusRect; /* set dialog count to zero */ - PrefContext->Count = 0; + PrefContext->MixerWindow->DialogCount = 0; SetRectEmpty(&PrefContext->MixerWindow->rect); /* enumerate controls */ SndMixerEnumConnections(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, EnumConnectionsCallback, (PVOID)PrefContext); + if (PrefContext->MixerWindow->bHasExtendedControls) + { + EnableMenuItem(GetMenu(PrefContext->MixerWindow->hWnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_ENABLED); + } + if (PrefContext->MixerWindow->hStatusBar) { GetWindowRect(PrefContext->MixerWindow->hStatusBar, &statusRect); @@ -667,12 +682,22 @@ LoadDialogCtrls( AdjustWindowRect(&PrefContext->MixerWindow->rect, WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, TRUE); SetWindowPos(PrefContext->MixerWindow->hWnd, HWND_TOP, PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.top, PrefContext->MixerWindow->rect.right - PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.bottom - PrefContext->MixerWindow->rect.top, SWP_NOMOVE | SWP_NOZORDER); - /* get last line separator */ - hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->Count); + /* Move the status bar */ + if (PrefContext->MixerWindow->hStatusBar) + { + SetWindowPos(PrefContext->MixerWindow->hStatusBar, + HWND_TOP, + statusRect.left, + PrefContext->MixerWindow->rect.bottom - (statusRect.bottom - statusRect.top), + PrefContext->MixerWindow->rect.right - PrefContext->MixerWindow->rect.left, + statusRect.bottom - statusRect.top, + SWP_NOZORDER); + } + /* Hide the last line separator */ + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->MixerWindow->DialogCount /*PrefContext->Count*/); if (hDlgCtrl != NULL) { - /* hide last separator */ ShowWindow(hDlgCtrl, SW_HIDE); } } @@ -689,7 +714,7 @@ UpdateDialogLineSwitchControl( WCHAR LineName[MIXER_LONG_NAME_CHARS]; /* find the index of this line */ - for (Index = 0; Index < PrefContext->Count; Index++) + for (Index = 0; Index < PrefContext->MixerWindow->DialogCount; Index++) { /* get id */ wID = (Index + 1) * IDC_LINE_NAME; @@ -736,7 +761,7 @@ UpdateDialogLineSliderControl( WCHAR LineName[MIXER_LONG_NAME_CHARS]; /* find the index of this line */ - for (Index = 0; Index < PrefContext->Count; Index++) + for (Index = 0; Index < PrefContext->MixerWindow->DialogCount; Index++) { /* get id */ wID = (Index + 1) * IDC_LINE_NAME; diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index ef3937f870..ef4b034071 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -45,7 +45,7 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -56,10 +56,11 @@ BEGIN LTEXT "Сила", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -70,7 +71,8 @@ BEGIN LTEXT "Сила", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index d021ab6715..7c9194affc 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -47,7 +47,7 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -58,10 +58,11 @@ BEGIN LTEXT "Hlasitost", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -72,7 +73,8 @@ BEGIN LTEXT "Hlasitost", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 43e956b4a9..5c5ef75732 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Lautstärke", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 67, 30, 56 AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Erweitert", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Lautstärke", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Erweitert", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 52139bcda0..219eeaa535 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 911f2b126a..4bbf0c7970 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index db470bfb67..a41f927c06 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -44,7 +44,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -55,10 +55,11 @@ BEGIN LTEXT "Volumen", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -69,7 +70,8 @@ BEGIN LTEXT "Volumen", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 6f7d4e7ab8..7f5b979501 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 588a7f085b..b9a59be989 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -42,7 +42,7 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" @@ -54,10 +54,11 @@ BEGIN LTEXT "עוצמה", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" @@ -69,7 +70,8 @@ BEGIN LTEXT "עוצמה", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index f228d43760..8b3c3d469d 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 078645050c..7d81b5c9df 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 53b2df0e9f..42c3d3fea6 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 7c30037bcb..d2a073e13b 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "MS UI Gothic" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "MS UI Gothic" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 3a3b8752ed..a7162f22fd 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "취소", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "굴림" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "굴림" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 5f085b9e02..fbe73c0d81 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index 2f60be9171..90bec932d7 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 0778d36094..1f92dd8068 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -52,10 +52,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +67,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 8986d6fc4e..7c4f35bd79 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -49,7 +49,7 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -60,10 +60,11 @@ BEGIN LTEXT "Głośność", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -74,7 +75,8 @@ BEGIN LTEXT "Głośność", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index b5d1f1e300..7497c866fd 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index c1bbb7c62c..2ef39850e1 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volum", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volum", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index fe94a0a4ac..2f4de0c79f 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Громкость", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Громкость", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 06295c283e..4e2252593a 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index 06bf7b4aa8..e066c7a916 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -45,7 +45,7 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -56,10 +56,11 @@ BEGIN LTEXT "Volumi", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -70,7 +71,8 @@ BEGIN LTEXT "Volumi", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index c9e86be88a..696e33d8cf 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Volyme", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Volyme", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 43b8307551..7dea489c24 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -49,7 +49,7 @@ BEGIN PUSHBUTTON "ยกเลิก", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -60,10 +60,11 @@ BEGIN LTEXT "Volume", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -74,7 +75,8 @@ BEGIN LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 5eeec0ed7a..ba59561b6a 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "Ses Düzeyi", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "Ses Düzeyi", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 72a9a16a36..d7cca4910a 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -49,7 +49,7 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -60,10 +60,11 @@ BEGIN LTEXT "Гучність", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -74,7 +75,8 @@ BEGIN LTEXT "Гучність", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index 7f264976d0..391ee962ef 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "宋体" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "音量", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "宋体" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "音量", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index 06db36d7ee..a2ae7214ab 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -43,7 +43,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14 END -IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "新細明體" BEGIN @@ -54,10 +54,11 @@ BEGIN LTEXT "音量", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 4, 138, 80, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 137 END -IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +IDD_NORMAL_LINE DIALOG 0, 0, 70, 138 STYLE WS_POPUP | WS_BORDER FONT 9, "新細明體" BEGIN @@ -68,7 +69,8 @@ BEGIN LTEXT "音量", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 + PUSHBUTTON "&Advanced", IDC_LINE_ADVANCED, 7, 138, 55, 14, WS_TABSTOP + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 113 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index c1aef28f19..65410469d2 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -23,7 +23,8 @@ #define IDC_LINE_SWITCH 1009 #define IDC_LINE_SLIDER_HORZ 1010 #define IDC_LINE_SLIDER_VERT 1011 -#define IDC_LINE_SEP 1012 +#define IDC_LINE_ADVANCED 1012 +#define IDC_LINE_SEP 1013 #define IDS_SNDVOL32 100 #define IDS_NOMIXERDEVICES 101 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 9d20e45526..bfb640981c 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -874,6 +874,77 @@ done: } +static VOID +ResizeMixerWindow( + PMIXER_WINDOW MixerWindow) +{ + RECT statusRect; + HWND hDlgCtrl; + UINT i; + LONG dy; + + if (MixerWindow->Mode != NORMAL_MODE) + return; + + if (MixerWindow->bHasExtendedControls == FALSE) + return; + + if (MixerWindow->hStatusBar) + { + GetWindowRect(MixerWindow->hStatusBar, &statusRect); + } + + /* Height of the 'Advanced' button in dialog units plus 2 units bottom space */ + #define BUTTON_HEIGHT 16 + dy = MulDiv(BUTTON_HEIGHT, MixerWindow->baseUnit.cy, 8); + + if (MixerWindow->bShowExtendedControls) + MixerWindow->rect.bottom += dy; + else + MixerWindow->rect.bottom -= dy; + + SetWindowPos(MixerWindow->hWnd, + HWND_TOP, + MixerWindow->rect.left, + MixerWindow->rect.top, + MixerWindow->rect.right - MixerWindow->rect.left, + MixerWindow->rect.bottom - MixerWindow->rect.top, + SWP_NOMOVE | SWP_NOZORDER); + + if (MixerWindow->hStatusBar) + { + SetWindowPos(MixerWindow->hStatusBar, + HWND_TOP, + statusRect.left, + MixerWindow->rect.bottom - (statusRect.bottom - statusRect.top), + MixerWindow->rect.right - MixerWindow->rect.left, + statusRect.bottom - statusRect.top, + SWP_NOZORDER); + } + + for (i = 0; i < MixerWindow->DialogCount; i++) + { + hDlgCtrl = GetDlgItem(MixerWindow->hWnd, IDC_LINE_SEP * i); + if (hDlgCtrl != NULL) + { + GetWindowRect(hDlgCtrl, &statusRect); + if (MixerWindow->bShowExtendedControls) + statusRect.bottom += dy; + else + statusRect.bottom -= dy; + + SetWindowPos(hDlgCtrl, + HWND_TOP, + 0, + 0, + statusRect.right - statusRect.left, + statusRect.bottom - statusRect.top, + SWP_NOMOVE | SWP_NOZORDER); + } + } +} + + static LRESULT CALLBACK MainWindowProc(HWND hwnd, UINT uMsg, @@ -938,9 +1009,6 @@ MainWindowProc(HWND hwnd, /* use new selected mixer */ Preferences.MixerWindow->Mixer = Pref.Mixer; - /* rebuild dialog controls */ - RebuildMixerWindowControls(&Preferences); - /* create status window */ if (MixerWindow->Mode == NORMAL_MODE) { @@ -957,10 +1025,21 @@ MainWindowProc(HWND hwnd, (LPARAM)szProduct); } } + + /* rebuild dialog controls */ + RebuildMixerWindowControls(&Preferences); } break; } + case IDM_ADVANCED_CONTROLS: + MixerWindow->bShowExtendedControls = !MixerWindow->bShowExtendedControls; + CheckMenuItem(GetMenu(hwnd), + IDM_ADVANCED_CONTROLS, + MF_BYCOMMAND | (MixerWindow->bShowExtendedControls ? MF_CHECKED : MF_UNCHECKED)); + ResizeMixerWindow(MixerWindow); + break; + case IDM_EXIT: { PostQuitMessage(0); @@ -1160,13 +1239,8 @@ MainWindowProc(HWND hwnd, /* copy product */ wcscpy(Preferences.DeviceName, szProduct); - if (!RebuildMixerWindowControls(&Preferences)) - { - DPRINT("Rebuilding mixer window controls failed!\n"); - SndMixerDestroy(MixerWindow->Mixer); - MixerWindow->Mixer = NULL; - Result = -1; - } + /* Disable the 'Advanced Controls' menu item */ + EnableMenuItem(GetMenu(hwnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); /* create status window */ if (MixerWindow->Mode == NORMAL_MODE) @@ -1184,8 +1258,13 @@ MainWindowProc(HWND hwnd, } } - /* Disable the 'Advanced Controls' menu item */ - EnableMenuItem(GetMenu(hwnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); + if (!RebuildMixerWindowControls(&Preferences)) + { + DPRINT("Rebuilding mixer window controls failed!\n"); + SndMixerDestroy(MixerWindow->Mixer); + MixerWindow->Mixer = NULL; + Result = -1; + } } break; } diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index 7ff11d8485..0e9a0ffd1f 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -43,11 +43,15 @@ typedef struct _MIXER_WINDOW UINT SelectedLine; UINT WindowCount; HWND *Window; + UINT DialogCount; WINDOW_MODE Mode; UINT MixerId; + BOOL bHasExtendedControls; + BOOL bShowExtendedControls; RECT rect; HFONT hFont; + SIZE baseUnit; } MIXER_WINDOW, *PMIXER_WINDOW; extern HINSTANCE hAppInstance; @@ -106,7 +110,6 @@ typedef struct _PREFERENCES_CONTEXT UINT OtherLines; TCHAR DeviceName[128]; - DWORD Count; DWORD tmp; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT;

5 years, 7 months

[reactos] 01/01: [RTL] Fix GCC build.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a951d66002fd3ce99f1de… commit a951d66002fd3ce99f1de2f241515303a93012e4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 17 09:58:28 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 17 09:59:49 2019 +0100 [RTL] Fix GCC build. --- sdk/lib/rtl/heap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 4d47ee2ec9..4c51053e65 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -2204,6 +2204,7 @@ BOOLEAN NTAPI RtlFreeHeap( RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); _SEH2_YIELD(return FALSE); } + _SEH2_END; /* Lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE))

5 years, 7 months

[reactos] 04/04: [ACPI] Update ACPICA library to version 20190215.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d53c935f22775e45f2cb… commit 9d53c935f22775e45f2cb980df86eecb1c81fd36 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Feb 15 19:43:25 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 17 09:51:20 2019 +0100 [ACPI] Update ACPICA library to version 20190215. --- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 6 + drivers/bus/acpi/acpica/dispatcher/dsopcode.c | 13 +- drivers/bus/acpi/acpica/dispatcher/dswload2.c | 2 +- drivers/bus/acpi/acpica/events/evgpe.c | 2 +- drivers/bus/acpi/acpica/events/evregion.c | 2 +- drivers/bus/acpi/acpica/events/evrgnini.c | 18 --- drivers/bus/acpi/acpica/events/evxfgpe.c | 4 +- drivers/bus/acpi/acpica/executer/exconvrt.c | 2 +- drivers/bus/acpi/acpica/executer/exfield.c | 62 +++++++ drivers/bus/acpi/acpica/executer/exserial.c | 2 +- drivers/bus/acpi/acpica/executer/exutils.c | 2 +- drivers/bus/acpi/acpica/include/acclib.h | 2 +- drivers/bus/acpi/acpica/include/acconfig.h | 2 +- drivers/bus/acpi/acpica/include/acdebug.h | 3 +- drivers/bus/acpi/acpica/include/acdisasm.h | 2 + drivers/bus/acpi/acpica/include/acexcep.h | 2 +- drivers/bus/acpi/acpica/include/aclocal.h | 2 +- drivers/bus/acpi/acpica/include/acmacros.h | 2 +- drivers/bus/acpi/acpica/include/acobject.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 10 +- drivers/bus/acpi/acpica/include/acpredef.h | 15 ++ drivers/bus/acpi/acpica/include/acrestyp.h | 14 +- drivers/bus/acpi/acpica/include/actbinfo.h | 7 +- drivers/bus/acpi/acpica/include/actbl1.h | 20 ++- drivers/bus/acpi/acpica/include/actbl2.h | 15 +- drivers/bus/acpi/acpica/include/actbl3.h | 23 ++- drivers/bus/acpi/acpica/include/actypes.h | 3 +- drivers/bus/acpi/acpica/include/platform/acefi.h | 2 +- drivers/bus/acpi/acpica/namespace/nsload.c | 2 +- drivers/bus/acpi/acpica/namespace/nsparse.c | 70 ++------ drivers/bus/acpi/acpica/namespace/nsutils.c | 2 +- drivers/bus/acpi/acpica/parser/psloop.c | 195 ----------------------- drivers/bus/acpi/acpica/parser/psparse.c | 4 +- drivers/bus/acpi/acpica/resources/rsdumpinfo.c | 14 +- drivers/bus/acpi/acpica/resources/rsirq.c | 8 +- drivers/bus/acpi/acpica/resources/rsserial.c | 10 +- drivers/bus/acpi/acpica/tables/tbfadt.c | 2 +- drivers/bus/acpi/acpica/tables/tbxface.c | 4 +- drivers/bus/acpi/acpica/tables/tbxfload.c | 26 ++- drivers/bus/acpi/acpica/utilities/utclib.c | 4 +- drivers/bus/acpi/acpica/utilities/utdecode.c | 5 +- drivers/bus/acpi/acpica/utilities/utdelete.c | 5 + drivers/bus/acpi/acpica/utilities/uterror.c | 9 +- drivers/bus/acpi/buspdo.c | 8 +- 44 files changed, 236 insertions(+), 372 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index 44e2889b12..ec1c125449 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -577,6 +577,12 @@ AcpiDsCreateField ( Info.RegionNode = RegionNode; Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); + if (Info.RegionNode->Type == ACPI_ADR_SPACE_PLATFORM_COMM && + !(RegionNode->Object->Field.InternalPccBuffer + = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } return_ACPI_STATUS (Status); } diff --git a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c index 97d6b3f5e6..1d35c5be77 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c @@ -413,6 +413,7 @@ AcpiDsEvalRegionOperands ( ACPI_OPERAND_OBJECT *OperandDesc; ACPI_NAMESPACE_NODE *Node; ACPI_PARSE_OBJECT *NextOp; + ACPI_ADR_SPACE_TYPE SpaceId; ACPI_FUNCTION_TRACE_PTR (DsEvalRegionOperands, Op); @@ -422,11 +423,12 @@ AcpiDsEvalRegionOperands ( * This is where we evaluate the address and length fields of the * OpRegion declaration */ - Node = Op->Common.Node; + Node = Op->Common.Node; /* NextOp points to the op that holds the SpaceID */ NextOp = Op->Common.Value.Arg; + SpaceId = (ACPI_ADR_SPACE_TYPE) NextOp->Common.Value.Integer; /* NextOp points to address op */ @@ -464,6 +466,15 @@ AcpiDsEvalRegionOperands ( ObjDesc->Region.Length = (UINT32) OperandDesc->Integer.Value; AcpiUtRemoveReference (OperandDesc); + /* A zero-length operation region is unusable. Just warn */ + + if (!ObjDesc->Region.Length && (SpaceId < ACPI_NUM_PREDEFINED_REGIONS)) + { + ACPI_WARNING ((AE_INFO, + "Operation Region [%4.4s] has zero length (SpaceId %X)", + Node->Name.Ascii, SpaceId)); + } + /* * Get the address and save it * (at top of stack - 1) diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload2.c b/drivers/bus/acpi/acpica/dispatcher/dswload2.c index 13677be514..373e265f64 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload2.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload2.c @@ -59,7 +59,7 @@ * FUNCTION: AcpiDsLoad2BeginOp * * PARAMETERS: WalkState - Current state of the parse tree walk - * OutOp - Wher to return op if a new one is created + * OutOp - Where to return op if a new one is created * * RETURN: Status * diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index bfef37a0a8..7527a0031b 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -904,7 +904,7 @@ AcpiEvGpeDispatch ( GpeDevice, GpeNumber, GpeEventInfo->Dispatch.Handler->Context); - /* If requested, clear (if level-triggered) and reenable the GPE */ + /* If requested, clear (if level-triggered) and re-enable the GPE */ if (ReturnValue & ACPI_REENABLE_GPE) { diff --git a/drivers/bus/acpi/acpica/events/evregion.c b/drivers/bus/acpi/acpica/events/evregion.c index dd37eca204..ea774e27b1 100644 --- a/drivers/bus/acpi/acpica/events/evregion.c +++ b/drivers/bus/acpi/acpica/events/evregion.c @@ -301,7 +301,7 @@ AcpiEvAddressSpaceDispatch ( /* * For handlers other than the default (supplied) handlers, we must * exit the interpreter because the handler *might* block -- we don't - * know what it will do, so we can't hold the lock on the intepreter. + * know what it will do, so we can't hold the lock on the interpreter. */ AcpiExExitInterpreter(); } diff --git a/drivers/bus/acpi/acpica/events/evrgnini.c b/drivers/bus/acpi/acpica/events/evrgnini.c index dc144e18fe..063afaa305 100644 --- a/drivers/bus/acpi/acpica/events/evrgnini.c +++ b/drivers/bus/acpi/acpica/events/evrgnini.c @@ -616,24 +616,6 @@ AcpiEvInitializeRegion ( HandlerObj = ObjDesc->CommonNotify.Handler; break; - case ACPI_TYPE_METHOD: - /* - * If we are executing module level code, the original - * Node's object was replaced by this Method object and we - * saved the handler in the method object. - * - * Note: Only used for the legacy MLC support. Will - * be removed in the future. - * - * See AcpiNsExecModuleCode - */ - if (!AcpiGbl_ExecuteTablesAsMethods && - ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) - { - HandlerObj = ObjDesc->Method.Dispatch.Handler; - } - break; - default: /* Ignore other objects */ diff --git a/drivers/bus/acpi/acpica/events/evxfgpe.c b/drivers/bus/acpi/acpica/events/evxfgpe.c index 1870d6a315..161f3c79e1 100644 --- a/drivers/bus/acpi/acpica/events/evxfgpe.c +++ b/drivers/bus/acpi/acpica/events/evxfgpe.c @@ -777,9 +777,9 @@ ACPI_EXPORT_SYMBOL (AcpiGetGpeStatus) * * RETURN: Status * - * DESCRIPTION: Clear and conditionally reenable a GPE. This completes the GPE + * DESCRIPTION: Clear and conditionally re-enable a GPE. This completes the GPE * processing. Intended for use by asynchronous host-installed - * GPE handlers. The GPE is only reenabled if the EnableForRun bit + * GPE handlers. The GPE is only re-enabled if the EnableForRun bit * is set in the GPE info. * ******************************************************************************/ diff --git a/drivers/bus/acpi/acpica/executer/exconvrt.c b/drivers/bus/acpi/acpica/executer/exconvrt.c index 398a700592..b32bb2f4bb 100644 --- a/drivers/bus/acpi/acpica/executer/exconvrt.c +++ b/drivers/bus/acpi/acpica/executer/exconvrt.c @@ -600,7 +600,7 @@ AcpiExConvertToString ( { if (Base == 16) { - /* Emit 0x prefix for explict/implicit hex conversion */ + /* Emit 0x prefix for explicit/implicit hex conversion */ *NewBuf++ = '0'; *NewBuf++ = 'x'; diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index 917cd2fd53..f4c4139b97 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -79,6 +79,17 @@ const UINT8 AcpiProtocolLengths[] = 0xFF /* F - ATTRIB_RAW_PROCESS_BYTES */ }; +#define PCC_MASTER_SUBSPACE 3 + +/* + * The following macros determine a given offset is a COMD field. + * According to the specification, generic subspaces (types 0-2) contains a + * 2-byte COMD field at offset 4 and master subspaces (type 3) contains a 4-byte + * COMD field starting at offset 12. + */ +#define GENERIC_SUBSPACE_COMMAND(a) (4 == a || a == 5) +#define MASTER_SUBSPACE_COMMAND(a) (12 <= a && a <= 15) + /******************************************************************************* * @@ -229,6 +240,23 @@ AcpiExReadDataFromField ( Status = AcpiExReadGpio (ObjDesc, Buffer); goto Exit; } + else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM)) + { + /* + * Reading from a PCC field unit does not require the handler because + * it only requires reading from the InternalPccBuffer. + */ + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "PCC FieldRead bits %u\n", ObjDesc->Field.BitLength)); + + memcpy (Buffer, ObjDesc->Field.RegionObj->Field.InternalPccBuffer + + ObjDesc->Field.BaseByteOffset, (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->Field.BitLength)); + + *RetBufferDesc = BufferDesc; + return AE_OK; + } ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "FieldRead [TO]: Obj %p, Type %X, Buf %p, ByteLen %X\n", @@ -285,6 +313,7 @@ AcpiExWriteDataToField ( { ACPI_STATUS Status; UINT32 BufferLength; + UINT32 DataLength; void *Buffer; @@ -331,6 +360,39 @@ AcpiExWriteDataToField ( Status = AcpiExWriteSerialBus (SourceDesc, ObjDesc, ResultDesc); return_ACPI_STATUS (Status); } + else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM)) + { + /* + * According to the spec a write to the COMD field will invoke the + * region handler. Otherwise, write to the PccInternal buffer. This + * implementation will use the offsets specified rather than the name + * of the field. This is considered safer because some firmware tools + * are known to obfiscate named objects. + */ + DataLength = (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->Field.BitLength); + memcpy (ObjDesc->Field.RegionObj->Field.InternalPccBuffer + + ObjDesc->Field.BaseByteOffset, + SourceDesc->Buffer.Pointer, DataLength); + + if ((ObjDesc->Field.RegionObj->Region.Address == PCC_MASTER_SUBSPACE && + MASTER_SUBSPACE_COMMAND (ObjDesc->Field.BaseByteOffset)) || + GENERIC_SUBSPACE_COMMAND (ObjDesc->Field.BaseByteOffset)) + { + /* Perform the write */ + + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "PCC COMD field has been written. Invoking PCC handler now.\n")); + + Status = AcpiExAccessRegion ( + ObjDesc, 0, (UINT64 *) ObjDesc->Field.RegionObj->Field.InternalPccBuffer, + ACPI_WRITE); + return_ACPI_STATUS (Status); + } + return (AE_OK); + } + /* Get a pointer to the data to be written */ diff --git a/drivers/bus/acpi/acpica/executer/exserial.c b/drivers/bus/acpi/acpica/executer/exserial.c index 2c7bf8bb38..005e7d5683 100644 --- a/drivers/bus/acpi/acpica/executer/exserial.c +++ b/drivers/bus/acpi/acpica/executer/exserial.c @@ -57,7 +57,7 @@ * FUNCTION: AcpiExReadGpio * * PARAMETERS: ObjDesc - The named field to read - * Buffer - Where the return data is returnd + * Buffer - Where the return data is returned * * RETURN: Status * diff --git a/drivers/bus/acpi/acpica/executer/exutils.c b/drivers/bus/acpi/acpica/executer/exutils.c index 0c2820b8ee..1334471a86 100644 --- a/drivers/bus/acpi/acpica/executer/exutils.c +++ b/drivers/bus/acpi/acpica/executer/exutils.c @@ -217,7 +217,7 @@ AcpiExTruncateFor32bitTable ( * RETURN: None * * DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field - * flags specifiy that it is to be obtained before field access. + * flags specify that it is to be obtained before field access. * ******************************************************************************/ diff --git a/drivers/bus/acpi/acpica/include/acclib.h b/drivers/bus/acpi/acpica/include/acclib.h index 6e23fc914b..44f79d0843 100644 --- a/drivers/bus/acpi/acpica/include/acclib.h +++ b/drivers/bus/acpi/acpica/include/acclib.h @@ -237,7 +237,7 @@ sprintf ( /* * NOTE: Currently we only need to update errno for file IOs. Other - * Clibrary invocations in ACPICA do not make descisions according to + * Clibrary invocations in ACPICA do not make decisions according to * the errno. */ extern int errno; diff --git a/drivers/bus/acpi/acpica/include/acconfig.h b/drivers/bus/acpi/acpica/include/acconfig.h index 12267bfb69..4a95e203ad 100644 --- a/drivers/bus/acpi/acpica/include/acconfig.h +++ b/drivers/bus/acpi/acpica/include/acconfig.h @@ -178,7 +178,7 @@ /* * Maximal number of elements the Result Stack can contain, - * it may be an arbitray value not exceeding the types of + * it may be an arbitrary value not exceeding the types of * ResultSize and ResultCount (now UINT8). */ #define ACPI_RESULTS_OBJ_NUM_MAX 255 diff --git a/drivers/bus/acpi/acpica/include/acdebug.h b/drivers/bus/acpi/acpica/include/acdebug.h index 4d9d3acfa7..6db3e3626c 100644 --- a/drivers/bus/acpi/acpica/include/acdebug.h +++ b/drivers/bus/acpi/acpica/include/acdebug.h @@ -51,7 +51,8 @@ #endif -#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ +#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ +#define ACPI_DEBUG_LENGTH_FORMAT " (%.4X bits, %.3X bytes)" typedef struct acpi_db_command_info { diff --git a/drivers/bus/acpi/acpica/include/acdisasm.h b/drivers/bus/acpi/acpica/include/acdisasm.h index 573f2876e1..7e692515c7 100644 --- a/drivers/bus/acpi/acpica/include/acdisasm.h +++ b/drivers/bus/acpi/acpica/include/acdisasm.h @@ -301,6 +301,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoFpdt1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGas[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtHdr[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtEl2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt0a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt1[]; @@ -445,6 +446,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat3[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat4[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat5[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoStao[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoStaoStr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaHdr[]; diff --git a/drivers/bus/acpi/acpica/include/acexcep.h b/drivers/bus/acpi/acpica/include/acexcep.h index fe2f19b2be..3b86b7d051 100644 --- a/drivers/bus/acpi/acpica/include/acexcep.h +++ b/drivers/bus/acpi/acpica/include/acexcep.h @@ -326,7 +326,7 @@ static const ACPI_EXCEPTION_INFO AcpiGbl_ExceptionNames_Aml[] = EXCEP_TXT ("AE_AML_DIVIDE_BY_ZERO", "During execution of AML Divide operator"), EXCEP_TXT ("AE_AML_BAD_NAME", "An ACPI name contains invalid character(s)"), EXCEP_TXT ("AE_AML_NAME_NOT_FOUND", "Could not resolve a named reference"), - EXCEP_TXT ("AE_AML_INTERNAL", "An internal error within the interprete"), + EXCEP_TXT ("AE_AML_INTERNAL", "An internal error within the interpreter"), EXCEP_TXT ("AE_AML_INVALID_SPACE_ID", "An Operation Region SpaceID is invalid"), EXCEP_TXT ("AE_AML_STRING_LIMIT", "String is longer than 200 characters"), EXCEP_TXT ("AE_AML_NO_RETURN_VALUE", "A method did not return a required value"), diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index 37e3f7f8f9..bd0a25d6d4 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -997,7 +997,7 @@ typedef struct acpi_comment_addr_node /* * File node - used for "Include" operator file stack and - * depdendency tree for the -ca option + * dependency tree for the -ca option */ typedef struct acpi_file_node { diff --git a/drivers/bus/acpi/acpica/include/acmacros.h b/drivers/bus/acpi/acpica/include/acmacros.h index ddb96cbd81..c216ea289e 100644 --- a/drivers/bus/acpi/acpica/include/acmacros.h +++ b/drivers/bus/acpi/acpica/include/acmacros.h @@ -502,7 +502,7 @@ /* - * Macors used for the ASL-/ASL+ converter utility + * Macros used for the ASL-/ASL+ converter utility */ #ifdef ACPI_ASL_COMPILER diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index 10bf5ef790..150f6fb236 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -345,6 +345,7 @@ typedef struct acpi_object_region_field union acpi_operand_object *RegionObj; /* Containing OpRegion object */ UINT8 *ResourceBuffer; /* ResourceTemplate for serial regions/fields */ UINT16 PinNumberIndex; /* Index relative to previous Connection/Template */ + UINT8 *InternalPccBuffer; /* Internal buffer for fields associated with PCC */ } ACPI_OBJECT_REGION_FIELD; diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index e8818bf800..ba6b8bba90 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190108 +#define ACPI_CA_VERSION 0x20190215 #include "acconfig.h" #include "actypes.h" @@ -192,14 +192,6 @@ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_CopyDsdtLocally, FALSE); */ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_DoNotUseXsdt, FALSE); -/* - * Optionally support module level code by parsing an entire table as - * a method as it is loaded. Default is TRUE. - * NOTE, this is essentially obsolete and will be removed soon - * (01/2018). - */ -ACPI_INIT_GLOBAL (UINT8, AcpiGbl_ExecuteTablesAsMethods, TRUE); - /* * Optionally use 32-bit FADT addresses if and when there is a conflict * (address mismatch) between the 32-bit and 64-bit versions of the diff --git a/drivers/bus/acpi/acpica/include/acpredef.h b/drivers/bus/acpi/acpica/include/acpredef.h index a42a6ab462..58610ad2a0 100644 --- a/drivers/bus/acpi/acpica/include/acpredef.h +++ b/drivers/bus/acpi/acpica/include/acpredef.h @@ -652,6 +652,21 @@ const ACPI_PREDEFINED_INFO AcpiGbl_PredefinedMethods[] = {{"_MTL", METHOD_0ARGS, /* ACPI 6.0 */ METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, + {{"_NBS", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NCH", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIG", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + {{"_NTT", METHOD_0ARGS, METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, diff --git a/drivers/bus/acpi/acpica/include/acrestyp.h b/drivers/bus/acpi/acpica/include/acrestyp.h index ab42a2ab46..847bc50cf2 100644 --- a/drivers/bus/acpi/acpica/include/acrestyp.h +++ b/drivers/bus/acpi/acpica/include/acrestyp.h @@ -179,7 +179,7 @@ typedef struct acpi_resource_irq UINT8 DescriptorLength; UINT8 Triggering; UINT8 Polarity; - UINT8 Sharable; + UINT8 Shareable; UINT8 WakeCapable; UINT8 InterruptCount; UINT8 Interrupts[1]; @@ -426,7 +426,7 @@ typedef struct acpi_resource_extended_irq UINT8 ProducerConsumer; UINT8 Triggering; UINT8 Polarity; - UINT8 Sharable; + UINT8 Shareable; UINT8 WakeCapable; UINT8 InterruptCount; ACPI_RESOURCE_SOURCE ResourceSource; @@ -450,7 +450,7 @@ typedef struct acpi_resource_gpio UINT8 ConnectionType; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ UINT8 PinConfig; - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 WakeCapable; /* For values, see Interrupt Attributes above */ UINT8 IoRestriction; UINT8 Triggering; /* For values, see Interrupt Attributes above */ @@ -628,7 +628,7 @@ typedef struct acpi_resource_pin_function { UINT8 RevisionId; UINT8 PinConfig; - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT16 FunctionNumber; UINT16 PinTableLength; UINT16 VendorLength; @@ -642,7 +642,7 @@ typedef struct acpi_resource_pin_config { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 PinConfigType; UINT32 PinConfigValue; UINT16 PinTableLength; @@ -686,7 +686,7 @@ typedef struct acpi_resource_pin_group_function { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT16 FunctionNumber; UINT16 VendorLength; ACPI_RESOURCE_SOURCE ResourceSource; @@ -699,7 +699,7 @@ typedef struct acpi_resource_pin_group_config { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 PinConfigType; /* For values, see PinConfigType above */ UINT32 PinConfigValue; UINT16 VendorLength; diff --git a/drivers/bus/acpi/acpica/include/actbinfo.h b/drivers/bus/acpi/acpica/include/actbinfo.h index 47e79f22f0..327c53381d 100644 --- a/drivers/bus/acpi/acpica/include/actbinfo.h +++ b/drivers/bus/acpi/acpica/include/actbinfo.h @@ -129,6 +129,7 @@ #define ACPI_GTDT0a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_TIMER_ENTRY,f) #define ACPI_GTDT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_WATCHDOG,f) #define ACPI_GTDTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_HEADER,f) +#define ACPI_GTDT_EL2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_EL2,f) #define ACPI_HEST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_MACHINE_CHECK,f) #define ACPI_HEST1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_CORRECTED,f) #define ACPI_HEST2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_NMI,f) @@ -140,7 +141,7 @@ #define ACPI_HEST11_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_DEFERRED_CHECK,f) #define ACPI_HESTN_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_NOTIFY,f) #define ACPI_HESTB_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_ERROR_BANK,f) -#define ACPI_HMAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_ADDRESS_RANGE,f) +#define ACPI_HMAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_PROXIMITY_DOMAIN,f) #define ACPI_HMAT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_LOCALITY,f) #define ACPI_HMAT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_CACHE,f) #define ACPI_HMATH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_STRUCTURE,f) @@ -226,6 +227,7 @@ #define ACPI_SRAT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f) #define ACPI_SRAT3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GICC_AFFINITY,f) #define ACPI_SRAT4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GIC_ITS_AFFINITY,f) +#define ACPI_SRAT5_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GENERIC_AFFINITY,f) #define ACPI_TCPA_CLIENT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_CLIENT,f) #define ACPI_TCPA_SERVER_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_SERVER,f) #define ACPI_TPM2A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_TRAILER,f) @@ -253,10 +255,11 @@ #define ACPI_SRAT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_MEM_AFFINITY,f,o) #define ACPI_SRAT2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f,o) #define ACPI_SRAT3_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_GICC_AFFINITY,f,o) +#define ACPI_SRAT5_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_GENERIC_AFFINITY,f,o) #define ACPI_GTDT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_GTDT,f,o) #define ACPI_GTDT0a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_TIMER_ENTRY,f,o) #define ACPI_GTDT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_WATCHDOG,f,o) -#define ACPI_HMAT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_ADDRESS_RANGE,f,o) +#define ACPI_HMAT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_PROXIMITY_DOMAIN,f,o) #define ACPI_HMAT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_LOCALITY,f,o) #define ACPI_HMAT2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_CACHE,f,o) #define ACPI_IORT3_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_SMMU,f,o) diff --git a/drivers/bus/acpi/acpica/include/actbl1.h b/drivers/bus/acpi/acpica/include/actbl1.h index 14b8ade133..4c761c870d 100644 --- a/drivers/bus/acpi/acpica/include/actbl1.h +++ b/drivers/bus/acpi/acpica/include/actbl1.h @@ -689,7 +689,7 @@ typedef struct acpi_dmar_hardware_unit #define ACPI_DMAR_INCLUDE_ALL (1) -/* 1: Reserved Memory Defininition */ +/* 1: Reserved Memory Definition */ typedef struct acpi_dmar_reserved_memory { @@ -1211,6 +1211,12 @@ typedef struct acpi_table_gtdt #define ACPI_GTDT_INTERRUPT_POLARITY (1<<1) #define ACPI_GTDT_ALWAYS_ON (1<<2) +typedef struct acpi_gtdt_el2 +{ + UINT32 VirtualEL2TimerGsiv; + UINT32 VirtualEL2TimerFlags; +} ACPI_GTDT_EL2; + /* Common GTDT subtable header */ @@ -1670,7 +1676,7 @@ typedef struct acpi_table_hmat enum AcpiHmatType { - ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subystem address range */ + ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subsystem address range */ ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */ ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */ ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */ @@ -1689,9 +1695,9 @@ typedef struct acpi_hmat_structure * HMAT Structures, correspond to Type in ACPI_HMAT_STRUCTURE */ -/* 0: Memory subystem address range */ +/* 0: Memory proximity domain attributes */ -typedef struct acpi_hmat_address_range +typedef struct acpi_hmat_proximity_domain { ACPI_HMAT_STRUCTURE Header; UINT16 Flags; @@ -1699,10 +1705,10 @@ typedef struct acpi_hmat_address_range UINT32 ProcessorPD; /* Processor proximity domain */ UINT32 MemoryPD; /* Memory proximity domain */ UINT32 Reserved2; - UINT64 PhysicalAddressBase; /* Physical address range base */ - UINT64 PhysicalAddressLength; /* Physical address range length */ + UINT64 Reserved3; + UINT64 Reserved4; -} ACPI_HMAT_ADDRESS_RANGE; +} ACPI_HMAT_PROXIMITY_DOMAIN; /* Masks for Flags field above */ diff --git a/drivers/bus/acpi/acpica/include/actbl2.h b/drivers/bus/acpi/acpica/include/actbl2.h index 3d2c070647..330445fd89 100644 --- a/drivers/bus/acpi/acpica/include/actbl2.h +++ b/drivers/bus/acpi/acpica/include/actbl2.h @@ -195,7 +195,7 @@ typedef struct acpi_iort_memory_access typedef struct acpi_iort_its_group { UINT32 ItsCount; - UINT32 Identifiers[1]; /* GIC ITS identifier arrary */ + UINT32 Identifiers[1]; /* GIC ITS identifier array */ } ACPI_IORT_ITS_GROUP; @@ -765,7 +765,7 @@ typedef struct acpi_madt_local_x2apic_nmi } ACPI_MADT_LOCAL_X2APIC_NMI; -/* 11: Generic Interrupt (ACPI 5.0 + ACPI 6.0 changes) */ +/* 11: Generic Interrupt - GICC (ACPI 5.0 + ACPI 6.0 + ACPI 6.3 changes) */ typedef struct acpi_madt_generic_interrupt { @@ -784,7 +784,8 @@ typedef struct acpi_madt_generic_interrupt UINT64 GicrBaseAddress; UINT64 ArmMpidr; UINT8 EfficiencyClass; - UINT8 Reserved2[3]; + UINT8 Reserved2[1]; + UINT16 SpeInterrupt; /* ACPI 6.3 */ } ACPI_MADT_GENERIC_INTERRUPT; @@ -1629,6 +1630,7 @@ typedef struct acpi_pdtt_channel #define ACPI_PDTT_RUNTIME_TRIGGER (1) #define ACPI_PDTT_WAIT_COMPLETION (1<<1) +#define ACPI_PDTT_TRIGGER_ORDER (1<<2) /******************************************************************************* @@ -1765,8 +1767,11 @@ typedef struct acpi_pptt_processor /* Flags */ -#define ACPI_PPTT_PHYSICAL_PACKAGE (1) /* Physical package */ -#define ACPI_PPTT_ACPI_PROCESSOR_ID_VALID (2) /* ACPI Processor ID valid */ +#define ACPI_PPTT_PHYSICAL_PACKAGE (1) +#define ACPI_PPTT_ACPI_PROCESSOR_ID_VALID (1<<1) +#define ACPI_PPTT_ACPI_PROCESSOR_IS_THREAD (1<<2) /* ACPI 6.3 */ +#define ACPI_PPTT_ACPI_LEAF_NODE (1<<3) /* ACPI 6.3 */ +#define ACPI_PPTT_ACPI_IDENTICAL (1<<4) /* ACPI 6.3 */ /* 1: Cache Type Structure */ diff --git a/drivers/bus/acpi/acpica/include/actbl3.h b/drivers/bus/acpi/acpica/include/actbl3.h index 85d41d9890..0f2743fa3f 100644 --- a/drivers/bus/acpi/acpica/include/actbl3.h +++ b/drivers/bus/acpi/acpica/include/actbl3.h @@ -242,8 +242,9 @@ enum AcpiSratType ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1, ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2, ACPI_SRAT_TYPE_GICC_AFFINITY = 3, - ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ - ACPI_SRAT_TYPE_RESERVED = 5 /* 5 and greater are reserved */ + ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ + ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5, /* ACPI 6.3 */ + ACPI_SRAT_TYPE_RESERVED = 6 /* 5 and greater are reserved */ }; /* @@ -339,6 +340,24 @@ typedef struct acpi_srat_gic_its_affinity } ACPI_SRAT_GIC_ITS_AFFINITY; +/* 5: Generic Initiator Affinity Structure (ACPI 6.3) */ + +typedef struct acpi_srat_generic_affinity +{ + ACPI_SUBTABLE_HEADER Header; + UINT8 Reserved; + UINT8 DeviceHandleType; + UINT32 ProximityDomain; + UINT8 DeviceHandle[16]; + UINT32 Flags; + UINT32 Reserved1; + +} ACPI_SRAT_GENERIC_AFFINITY; + +/* Flags for ACPI_SRAT_GENERIC_AFFINITY */ + +#define ACPI_SRAT_GENERIC_AFFINITY_ENABLED (1) /* 00: Use affinity structure */ + /******************************************************************************* * * STAO - Status Override Table (_STA override) - ACPI 6.0 diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 0c96c820c3..b7c645f813 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -659,8 +659,9 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_NOTIFY_SHUTDOWN_REQUEST (UINT8) 0x0C #define ACPI_NOTIFY_AFFINITY_UPDATE (UINT8) 0x0D #define ACPI_NOTIFY_MEMORY_UPDATE (UINT8) 0x0E +#define ACPI_NOTIFY_DISCONNECT_RECOVER (UINT8) 0x0F -#define ACPI_GENERIC_NOTIFY_MAX 0x0E +#define ACPI_GENERIC_NOTIFY_MAX 0x0F #define ACPI_SPECIFIC_NOTIFY_MAX 0x84 /* diff --git a/drivers/bus/acpi/acpica/include/platform/acefi.h b/drivers/bus/acpi/acpica/include/platform/acefi.h index a8790883af..198e34d2e3 100644 --- a/drivers/bus/acpi/acpica/include/platform/acefi.h +++ b/drivers/bus/acpi/acpica/include/platform/acefi.h @@ -52,7 +52,7 @@ #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED #endif /* !DEBUGGER_THREADING */ -/* EDK2 EFI environemnt */ +/* EDK2 EFI environment */ #if defined(_EDK2_EFI) diff --git a/drivers/bus/acpi/acpica/namespace/nsload.c b/drivers/bus/acpi/acpica/namespace/nsload.c index c5a1921b0b..07f5b6b70e 100644 --- a/drivers/bus/acpi/acpica/namespace/nsload.c +++ b/drivers/bus/acpi/acpica/namespace/nsload.c @@ -125,7 +125,7 @@ AcpiNsLoadTable ( /* * On error, delete any namespace objects created by this table. * We cannot initialize these objects, so delete them. There are - * a couple of expecially bad cases: + * a couple of especially bad cases: * AE_ALREADY_EXISTS - namespace collision. * AE_NOT_FOUND - the target of a Scope operator does not * exist. This target of Scope must already exist in the diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c b/drivers/bus/acpi/acpica/namespace/nsparse.c index 542c9c9345..c7e33972a6 100644 --- a/drivers/bus/acpi/acpica/namespace/nsparse.c +++ b/drivers/bus/acpi/acpica/namespace/nsparse.c @@ -314,66 +314,18 @@ AcpiNsParseTable ( ACPI_FUNCTION_TRACE (NsParseTable); - if (AcpiGbl_ExecuteTablesAsMethods) - { - /* - * This case executes the AML table as one large control method. - * The point of this is to execute any module-level code in-place - * as the table is parsed. Some AML code depends on this behavior. - * - * It is a run-time option at this time, but will eventually become - * the default. - * - * Note: This causes the table to only have a single-pass parse. - * However, this is compatible with other ACPI implementations. - */ - ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE, - "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); - - Status = AcpiNsExecuteTable (TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - } - else - { - /* - * AML Parse, pass 1 - * - * In this pass, we load most of the namespace. Control methods - * are not parsed until later. A parse tree is not created. - * Instead, each Parser Op subtree is deleted when it is finished. - * This saves a great deal of memory, and allows a small cache of - * parse objects to service the entire parse. The second pass of - * the parse then performs another complete parse of the AML. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 1\n")); - - Status = AcpiNsOneCompleteParse (ACPI_IMODE_LOAD_PASS1, - TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + /* + * Executes the AML table as one large control method. + * The point of this is to execute any module-level code in-place + * as the table is parsed. Some AML code depends on this behavior. + * + * Note: This causes the table to only have a single-pass parse. + * However, this is compatible with other ACPI implementations. + */ + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE, + "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); - /* - * AML Parse, pass 2 - * - * In this pass, we resolve forward references and other things - * that could not be completed during the first pass. - * Another complete parse of the AML is performed, but the - * overhead of this is compensated for by the fact that the - * parse objects are all cached. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 2\n")); - Status = AcpiNsOneCompleteParse (ACPI_IMODE_LOAD_PASS2, - TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - } + Status = AcpiNsExecuteTable (TableIndex, StartNode); return_ACPI_STATUS (Status); } diff --git a/drivers/bus/acpi/acpica/namespace/nsutils.c b/drivers/bus/acpi/acpica/namespace/nsutils.c index e234855cb1..fe0fd35e05 100644 --- a/drivers/bus/acpi/acpica/namespace/nsutils.c +++ b/drivers/bus/acpi/acpica/namespace/nsutils.c @@ -453,7 +453,7 @@ AcpiNsInternalizeName ( * * FUNCTION: AcpiNsExternalizeName * - * PARAMETERS: InternalNameLength - Lenth of the internal name below + * PARAMETERS: InternalNameLength - Length of the internal name below * InternalName - Internal representation of name * ConvertedNameLength - Where the length is returned * ConvertedName - Where the resulting external name diff --git a/drivers/bus/acpi/acpica/parser/psloop.c b/drivers/bus/acpi/acpica/parser/psloop.c index 61ff2d1fcb..3170992674 100644 --- a/drivers/bus/acpi/acpica/parser/psloop.c +++ b/drivers/bus/acpi/acpica/parser/psloop.c @@ -70,13 +70,6 @@ AcpiPsGetArguments ( UINT8 *AmlOpStart, ACPI_PARSE_OBJECT *Op); -static void -AcpiPsLinkModuleCode ( - ACPI_PARSE_OBJECT *ParentOp, - UINT8 *AmlStart, - UINT32 AmlLength, - ACPI_OWNER_ID OwnerId); - /******************************************************************************* * @@ -100,7 +93,6 @@ AcpiPsGetArguments ( { ACPI_STATUS Status = AE_OK; ACPI_PARSE_OBJECT *Arg = NULL; - const ACPI_OPCODE_INFO *OpInfo; ACPI_FUNCTION_TRACE_PTR (PsGetArguments, WalkState); @@ -179,82 +171,6 @@ AcpiPsGetArguments ( "Final argument count: %8.8X pass %u\n", WalkState->ArgCount, WalkState->PassNumber)); - /* - * This case handles the legacy option that groups all module-level - * code blocks together and defers execution until all of the tables - * are loaded. Execute all of these blocks at this time. - * Execute any module-level code that was detected during the table - * load phase. - * - * Note: this option is deprecated and will be eliminated in the - * future. Use of this option can cause problems with AML code that - * depends upon in-order immediate execution of module-level code. - */ - if (!AcpiGbl_ExecuteTablesAsMethods && - (WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2) && - ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) == 0)) - { - /* - * We want to skip If/Else/While constructs during Pass1 because we - * want to actually conditionally execute the code during Pass2. - * - * Except for disassembly, where we always want to walk the - * If/Else/While packages - */ - switch (Op->Common.AmlOpcode) - { - case AML_IF_OP: - case AML_ELSE_OP: - case AML_WHILE_OP: - /* - * Currently supported module-level opcodes are: - * IF/ELSE/WHILE. These appear to be the most common, - * and easiest to support since they open an AML - * package. - */ - if (WalkState->PassNumber == ACPI_IMODE_LOAD_PASS1) - { - AcpiPsLinkModuleCode (Op->Common.Parent, AmlOpStart, - (UINT32) (WalkState->ParserState.PkgEnd - AmlOpStart), - WalkState->OwnerId); - } - - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Pass1: Skipping an If/Else/While body\n")); - - /* Skip body of if/else/while in pass 1 */ - - WalkState->ParserState.Aml = WalkState->ParserState.PkgEnd; - WalkState->ArgCount = 0; - break; - - default: - /* - * Check for an unsupported executable opcode at module - * level. We must be in PASS1, the parent must be a SCOPE, - * The opcode class must be EXECUTE, and the opcode must - * not be an argument to another opcode. - */ - if ((WalkState->PassNumber == ACPI_IMODE_LOAD_PASS1) && - (Op->Common.Parent->Common.AmlOpcode == AML_SCOPE_OP)) - { - OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); - if ((OpInfo->Class == AML_CLASS_EXECUTE) && - (!Arg)) - { - ACPI_WARNING ((AE_INFO, - "Unsupported module-level executable opcode " - "0x%.2X at table offset 0x%.4X", - Op->Common.AmlOpcode, - (UINT32) (ACPI_PTR_DIFF (AmlOpStart, - WalkState->ParserState.AmlStart) + - sizeof (ACPI_TABLE_HEADER)))); - } - } - break; - } - } - /* Special processing for certain opcodes */ switch (Op->Common.AmlOpcode) @@ -326,117 +242,6 @@ AcpiPsGetArguments ( } -/******************************************************************************* - * - * FUNCTION: AcpiPsLinkModuleCode - * - * PARAMETERS: ParentOp - Parent parser op - * AmlStart - Pointer to the AML - * AmlLength - Length of executable AML - * OwnerId - OwnerId of module level code - * - * RETURN: None. - * - * DESCRIPTION: Wrap the module-level code with a method object and link the - * object to the global list. Note, the mutex field of the method - * object is used to link multiple module-level code objects. - * - * NOTE: In this legacy option, each block of detected executable AML - * code that is outside of any control method is wrapped with a temporary - * control method object and placed on a global list below. - * - * This function executes the module-level code for all tables only after - * all of the tables have been loaded. It is a legacy option and is - * not compatible with other ACPI implementations. See AcpiNsLoadTable. - * - * This function will be removed when the legacy option is removed. - * - ******************************************************************************/ - -static void -AcpiPsLinkModuleCode ( - ACPI_PARSE_OBJECT *ParentOp, - UINT8 *AmlStart, - UINT32 AmlLength, - ACPI_OWNER_ID OwnerId) -{ - ACPI_OPERAND_OBJECT *Prev; - ACPI_OPERAND_OBJECT *Next; - ACPI_OPERAND_OBJECT *MethodObj; - ACPI_NAMESPACE_NODE *ParentNode; - - - ACPI_FUNCTION_TRACE (PsLinkModuleCode); - - - /* Get the tail of the list */ - - Prev = Next = AcpiGbl_ModuleCodeList; - while (Next) - { - Prev = Next; - Next = Next->Method.Mutex; - } - - /* - * Insert the module level code into the list. Merge it if it is - * adjacent to the previous element. - */ - if (!Prev || - ((Prev->Method.AmlStart + Prev->Method.AmlLength) != AmlStart)) - { - /* Create, initialize, and link a new temporary method object */ - - MethodObj = AcpiUtCreateInternalObject (ACPI_TYPE_METHOD); - if (!MethodObj) - { - return_VOID; - } - - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Create/Link new code block: %p\n", MethodObj)); - - if (ParentOp->Common.Node) - { - ParentNode = ParentOp->Common.Node; - } - else - { - ParentNode = AcpiGbl_RootNode; - } - - MethodObj->Method.AmlStart = AmlStart; - MethodObj->Method.AmlLength = AmlLength; - MethodObj->Method.OwnerId = OwnerId; - MethodObj->Method.InfoFlags |= ACPI_METHOD_MODULE_LEVEL; - - /* - * Save the parent node in NextObject. This is cheating, but we - * don't want to expand the method object. - */ - MethodObj->Method.NextObject = - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, ParentNode); - - if (!Prev) - { - AcpiGbl_ModuleCodeList = MethodObj; - } - else - { - Prev->Method.Mutex = MethodObj; - } - } - else - { - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Appending to existing code block: %p\n", Prev)); - - Prev->Method.AmlLength += AmlLength; - } - - return_VOID; -} - /******************************************************************************* * * FUNCTION: AcpiPsParseLoop diff --git a/drivers/bus/acpi/acpica/parser/psparse.c b/drivers/bus/acpi/acpica/parser/psparse.c index f4181b99c2..dfd1469999 100644 --- a/drivers/bus/acpi/acpica/parser/psparse.c +++ b/drivers/bus/acpi/acpica/parser/psparse.c @@ -572,12 +572,12 @@ AcpiPsParseAml ( if (Status == AE_ABORT_METHOD) { AcpiNsPrintNodePathname ( - WalkState->MethodNode, "Method aborted:"); + WalkState->MethodNode, "Aborting method"); AcpiOsPrintf ("\n"); } else { - ACPI_ERROR_METHOD ("Method parse/execution failed", + ACPI_ERROR_METHOD ("Aborting method", WalkState->MethodNode, NULL, Status); } AcpiExEnterInterpreter (); diff --git a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c index bb6fe481fe..12bd7d04ef 100644 --- a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c +++ b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c @@ -72,7 +72,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[7] = {ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.DescriptorLength), "Descriptor Length", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Polarity), "Polarity", AcpiGbl_LlDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Irq.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.InterruptCount), "Interrupt Count", NULL}, {ACPI_RSD_SHORTLIST,ACPI_RSD_OFFSET (Irq.Interrupts[0]), "Interrupt List", NULL} }; @@ -216,7 +216,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] = {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.ProducerConsumer), "Type", AcpiGbl_ConsumeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Polarity), "Polarity", AcpiGbl_LlDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (ExtendedIrq.ResourceSource), NULL, NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (ExtendedIrq.InterruptCount), "Interrupt Count", NULL}, {ACPI_RSD_DWORDLIST,ACPI_RSD_OFFSET (ExtendedIrq.Interrupts[0]), "Interrupt List", NULL} @@ -239,7 +239,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGpio[16] = {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.ConnectionType), "ConnectionType", AcpiGbl_CtDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.PinConfig), "PinConfig", AcpiGbl_PpcDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.IoRestriction), "IoRestriction", AcpiGbl_IorDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Polarity), "Polarity", AcpiGbl_LlDecode}, @@ -257,7 +257,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinFunction[10] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinFunction), "PinFunction", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinFunction.RevisionId), "RevisionId", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinFunction.PinConfig), "PinConfig", AcpiGbl_PpcDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinFunction.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinFunction.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinFunction.FunctionNumber), "FunctionNumber", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinFunction.ResourceSource), "ResourceSource", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinFunction.PinTableLength), "PinTableLength", NULL}, @@ -271,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinConfig[11] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinConfig), "PinConfig", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinConfig.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinConfig.PinConfigType), "PinConfigType", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (PinConfig.PinConfigValue), "PinConfigValue", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinConfig.ResourceSource), "ResourceSource", NULL}, @@ -298,7 +298,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinGroupFunction[9] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinGroupFunction), "PinGroupFunction", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupFunction.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinGroupFunction.FunctionNumber), "FunctionNumber", NULL}, {ACPI_RSD_SOURCE_LABEL, ACPI_RSD_OFFSET (PinGroupFunction.ResourceSourceLabel), "ResourceSourceLabel", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinGroupFunction.ResourceSource), "ResourceSource", NULL}, @@ -311,7 +311,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinGroupConfig[10] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinGroupConfig), "PinGroupConfig", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupConfig.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupConfig.PinConfigType), "PinConfigType", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (PinGroupConfig.PinConfigValue), "PinConfigValue", NULL}, {ACPI_RSD_SOURCE_LABEL, ACPI_RSD_OFFSET (PinGroupConfig.ResourceSourceLabel), "ResourceSourceLabel", NULL}, diff --git a/drivers/bus/acpi/acpica/resources/rsirq.c b/drivers/bus/acpi/acpica/resources/rsirq.c index 8514445f98..50a6001340 100644 --- a/drivers/bus/acpi/acpica/resources/rsirq.c +++ b/drivers/bus/acpi/acpica/resources/rsirq.c @@ -93,7 +93,7 @@ ACPI_RSCONVERT_INFO AcpiRsGetIrq[9] = AML_OFFSET (Irq.Flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Shareable), AML_OFFSET (Irq.Flags), 4}, @@ -133,7 +133,7 @@ ACPI_RSCONVERT_INFO AcpiRsSetIrq[14] = AML_OFFSET (Irq.Flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Shareable), AML_OFFSET (Irq.Flags), 4}, @@ -180,7 +180,7 @@ ACPI_RSCONVERT_INFO AcpiRsSetIrq[14] = ACPI_ACTIVE_HIGH}, {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE, - ACPI_RS_OFFSET (Data.Irq.Sharable), + ACPI_RS_OFFSET (Data.Irq.Shareable), ACPI_EXCLUSIVE}, /* We can optimize to a 2-byte IrqNoFlags() descriptor */ @@ -221,7 +221,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertExtIrq[10] = AML_OFFSET (ExtendedIrq.Flags), 2}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.ExtendedIrq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.ExtendedIrq.Shareable), AML_OFFSET (ExtendedIrq.Flags), 3}, diff --git a/drivers/bus/acpi/acpica/resources/rsserial.c b/drivers/bus/acpi/acpica/resources/rsserial.c index 31edd7203c..aed946b1f7 100644 --- a/drivers/bus/acpi/acpica/resources/rsserial.c +++ b/drivers/bus/acpi/acpica/resources/rsserial.c @@ -78,7 +78,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertGpio[18] = AML_OFFSET (Gpio.Flags), 0}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Gpio.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Gpio.Shareable), AML_OFFSET (Gpio.IntFlags), 3}, @@ -166,7 +166,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinFunction[13] = AML_OFFSET (PinFunction.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinFunction.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinFunction.Shareable), AML_OFFSET (PinFunction.Flags), 0}, @@ -531,7 +531,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinConfig[14] = AML_OFFSET (PinConfig.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinConfig.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinConfig.Shareable), AML_OFFSET (PinConfig.Flags), 0}, @@ -667,7 +667,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupFunction[13] = AML_OFFSET (PinGroupFunction.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupFunction.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupFunction.Shareable), AML_OFFSET (PinGroupFunction.Flags), 0}, @@ -734,7 +734,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupConfig[14] = AML_OFFSET (PinGroupConfig.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupConfig.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupConfig.Shareable), AML_OFFSET (PinGroupConfig.Flags), 0}, diff --git a/drivers/bus/acpi/acpica/tables/tbfadt.c b/drivers/bus/acpi/acpica/tables/tbfadt.c index f56d31e96f..7a1c82fa14 100644 --- a/drivers/bus/acpi/acpica/tables/tbfadt.c +++ b/drivers/bus/acpi/acpica/tables/tbfadt.c @@ -632,7 +632,7 @@ AcpiTbConvertFadt ( * 64-bit X length field. * Note: If the legacy length field is > 0xFF bits, ignore * this check. (GPE registers can be larger than the - * 64-bit GAS structure can accomodate, 0xFF bits). + * 64-bit GAS structure can accommodate, 0xFF bits). */ if ((ACPI_MUL_8 (Length) <= ACPI_UINT8_MAX) && (Address64->BitWidth != ACPI_MUL_8 (Length))) diff --git a/drivers/bus/acpi/acpica/tables/tbxface.c b/drivers/bus/acpi/acpica/tables/tbxface.c index 2ceb049fe2..6974964033 100644 --- a/drivers/bus/acpi/acpica/tables/tbxface.c +++ b/drivers/bus/acpi/acpica/tables/tbxface.c @@ -155,7 +155,7 @@ AcpiInitializeTables ( /* * Get the root table (RSDT or XSDT) and extract all entries to the local * Root Table Array. This array contains the information of the RSDT/XSDT - * in a common, more useable format. + * in a common, more usable format. */ Status = AcpiTbParseRootTable (RsdpAddress); return_ACPI_STATUS (Status); @@ -226,7 +226,7 @@ AcpiReallocateRootTable ( { /* * Now it's safe to do full table validation. We can do deferred - * table initilization here once the flag is set. + * table initialization here once the flag is set. */ AcpiGbl_EnableTableValidation = TRUE; for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index ad2b766506..32095dccf8 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -111,25 +111,19 @@ AcpiLoadTables ( "While loading namespace from ACPI tables")); } - if (AcpiGbl_ExecuteTablesAsMethods) + /* + * Initialize the objects in the namespace that remain uninitialized. + * This runs the executable AML that may be part of the declaration of + * these name objects: + * OperationRegions, BufferFields, Buffers, and Packages. + * + */ + Status = AcpiNsInitializeObjects (); + if (ACPI_SUCCESS (Status)) { - /* - * If the module-level code support is enabled, initialize the objects - * in the namespace that remain uninitialized. This runs the executable - * AML that may be part of the declaration of these name objects: - * OperationRegions, BufferFields, Buffers, and Packages. - * - * Note: The module-level code is optional at this time, but will - * become the default in the future. - */ - Status = AcpiNsInitializeObjects (); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + AcpiGbl_NamespaceInitialized = TRUE; } - AcpiGbl_NamespaceInitialized = TRUE; return_ACPI_STATUS (Status); } diff --git a/drivers/bus/acpi/acpica/utilities/utclib.c b/drivers/bus/acpi/acpica/utilities/utclib.c index d0547cf9c1..2afe7f1c1b 100644 --- a/drivers/bus/acpi/acpica/utilities/utclib.c +++ b/drivers/bus/acpi/acpica/utilities/utclib.c @@ -291,7 +291,7 @@ strlen ( * PARAMETERS: String - Null terminated string * Delimiters - Delimiters to match * - * RETURN: The first occurance in the string of any of the bytes in the + * RETURN: The first occurrence in the string of any of the bytes in the * delimiters * * DESCRIPTION: Search a string for any of a set of the delimiters @@ -681,7 +681,7 @@ strstr ( * FUNCTION: strtoul * * PARAMETERS: String - Null terminated string - * Terminater - Where a pointer to the terminating byte is + * Terminator - Where a pointer to the terminating byte is * returned * Base - Radix of the string * diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c b/drivers/bus/acpi/acpica/utilities/utdecode.c index d8423a907a..9bd3d501fa 100644 --- a/drivers/bus/acpi/acpica/utilities/utdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utdecode.c @@ -525,6 +525,7 @@ static const char *AcpiGbl_GenericNotify[ACPI_GENERIC_NOTIFY_MAX + 1] /* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI 6.0 */ /* 0D */ "System Resource Affinity Update", /* 0E */ "Heterogeneous Memory Attributes Update" /* ACPI 6.2 */ + /* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */ }; static const char *AcpiGbl_DeviceNotify[5] = @@ -561,14 +562,14 @@ AcpiUtGetNotifyName ( ACPI_OBJECT_TYPE Type) { - /* 00 - 0D are "common to all object types" (from ACPI Spec) */ + /* 00 - 0F are "common to all object types" (from ACPI Spec) */ if (NotifyValue <= ACPI_GENERIC_NOTIFY_MAX) { return (AcpiGbl_GenericNotify[NotifyValue]); } - /* 0E - 7F are reserved */ + /* 10 - 7F are reserved */ if (NotifyValue <= ACPI_MAX_SYS_NOTIFY) { diff --git a/drivers/bus/acpi/acpica/utilities/utdelete.c b/drivers/bus/acpi/acpica/utilities/utdelete.c index 68fd650f2c..ff41facfec 100644 --- a/drivers/bus/acpi/acpica/utilities/utdelete.c +++ b/drivers/bus/acpi/acpica/utilities/utdelete.c @@ -304,6 +304,11 @@ AcpiUtDeleteInternalObj ( AcpiUtDeleteObjectDesc (SecondDesc); } + if (Object->Field.InternalPccBuffer) + { + ACPI_FREE(Object->Field.InternalPccBuffer); + } + break; case ACPI_TYPE_BUFFER_FIELD: diff --git a/drivers/bus/acpi/acpica/utilities/uterror.c b/drivers/bus/acpi/acpica/utilities/uterror.c index 1082009c16..76778943a5 100644 --- a/drivers/bus/acpi/acpica/utilities/uterror.c +++ b/drivers/bus/acpi/acpica/utilities/uterror.c @@ -245,19 +245,19 @@ AcpiUtPrefixedNamespaceError ( case AE_ALREADY_EXISTS: AcpiOsPrintf (ACPI_MSG_BIOS_ERROR); - Message = "Failure creating"; + Message = "Failure creating named object"; break; case AE_NOT_FOUND: AcpiOsPrintf (ACPI_MSG_BIOS_ERROR); - Message = "Could not resolve"; + Message = "Could not resolve symbol"; break; default: AcpiOsPrintf (ACPI_MSG_ERROR); - Message = "Failure resolving"; + Message = "Failure resolving symbol"; break; } @@ -392,7 +392,8 @@ AcpiUtMethodError ( } AcpiNsPrintNodePathname (Node, Message); - AcpiOsPrintf (", %s", AcpiFormatException (MethodStatus)); + AcpiOsPrintf (" due to previous error (%s)", + AcpiFormatException (MethodStatus)); ACPI_MSG_SUFFIX; ACPI_MSG_REDIRECT_END; diff --git a/drivers/bus/acpi/buspdo.c b/drivers/bus/acpi/buspdo.c index 9abd48a2a8..ac43a847dd 100644 --- a/drivers/bus/acpi/buspdo.c +++ b/drivers/bus/acpi/buspdo.c @@ -971,7 +971,7 @@ Bus_PDO_QueryResources( ResourceDescriptor->Type = CmResourceTypeInterrupt; ResourceDescriptor->ShareDisposition = - (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + (irq_data->Shareable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); ResourceDescriptor->u.Interrupt.Level = @@ -990,7 +990,7 @@ Bus_PDO_QueryResources( ResourceDescriptor->Type = CmResourceTypeInterrupt; ResourceDescriptor->ShareDisposition = - (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + (irq_data->Shareable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); ResourceDescriptor->u.Interrupt.Level = @@ -1445,7 +1445,7 @@ Bus_PDO_QueryResourceRequirements( { RequirementDescriptor->Option = (i == 0) ? IO_RESOURCE_PREFERRED : IO_RESOURCE_ALTERNATIVE; RequirementDescriptor->Type = CmResourceTypeInterrupt; - RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + RequirementDescriptor->ShareDisposition = (irq_data->Shareable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i]; @@ -1461,7 +1461,7 @@ Bus_PDO_QueryResourceRequirements( { RequirementDescriptor->Option = (i == 0) ? IO_RESOURCE_PREFERRED : IO_RESOURCE_ALTERNATIVE; RequirementDescriptor->Type = CmResourceTypeInterrupt; - RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + RequirementDescriptor->ShareDisposition = (irq_data->Shareable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i];

5 years, 7 months

[reactos] 03/04: [COMCTL32] Check for NULL pointer when handling BCM_GETIDEALSIZE.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dcdf82e71c3b03261725… commit 8dcdf82e71c3b032617251ab0ec2024b7f4f820a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 3 16:55:04 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 17 09:51:18 2019 +0100 [COMCTL32] Check for NULL pointer when handling BCM_GETIDEALSIZE. Fixes crash in comctl32_winetest:button. --- dll/win32/comctl32/button.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 59067471f1..1d7431d0b1 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -941,6 +941,11 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L BOOL ret = FALSE; SIZE* pSize = (SIZE*)lParam; + if (!pSize) + { + return FALSE; + } + if (btn_type == BS_PUSHBUTTON || btn_type == BS_DEFPUSHBUTTON || btn_type == BS_USERBUTTON)

5 years, 7 months

[reactos] 02/04: [COMCTL32] Add NULL checks to SetWindowSubclass.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3445129dd314c19b60275… commit 3445129dd314c19b6027532019e0e703f0b77c3a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 3 16:41:29 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 17 09:51:16 2019 +0100 [COMCTL32] Add NULL checks to SetWindowSubclass. Imports Wine commit 04847e68f87 by Sven Baars. Fixes crash in comctl32_winetest:subclass. --- dll/win32/comctl32/commctrl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/comctl32/commctrl.c b/dll/win32/comctl32/commctrl.c index d4cb73ae76..a3bbd5fc31 100644 --- a/dll/win32/comctl32/commctrl.c +++ b/dll/win32/comctl32/commctrl.c @@ -1266,6 +1266,9 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef); + if (!hWnd || !pfnSubclass) + return FALSE; + /* Since the window procedure that we set here has two additional arguments, * we can't simply set it as the new window procedure of the window. So we * set our own window procedure and then calculate the other two arguments

5 years, 7 months

[reactos] 01/04: [RTL] Protect pointer validity check in RtlFreeHeap with SEH.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7246909a80cdb8dc42098… commit 7246909a80cdb8dc420981974c21bbbdbf0bd48b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 3 13:57:21 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 17 09:51:12 2019 +0100 [RTL] Protect pointer validity check in RtlFreeHeap with SEH. Fixes crash in kernel32_winetest:heap. --- sdk/lib/rtl/heap.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 1c6df2996f..4d47ee2ec9 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -2180,28 +2180,36 @@ BOOLEAN NTAPI RtlFreeHeap( if (RtlpHeapIsSpecial(Flags)) return RtlDebugFreeHeap(Heap, Flags, Ptr); - /* Lock if necessary */ - if (!(Flags & HEAP_NO_SERIALIZE)) - { - RtlEnterHeapLock(Heap->LockVariable, TRUE); - Locked = TRUE; - } - /* Get pointer to the heap entry */ HeapEntry = (PHEAP_ENTRY)Ptr - 1; - /* Check this entry, fail if it's invalid */ - if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY) || - (((ULONG_PTR)Ptr & 0x7) != 0) || - (HeapEntry->SegmentOffset >= HEAP_SEGMENTS)) + /* Protect with SEH in case the pointer is not valid */ + _SEH2_TRY + { + /* Check this entry, fail if it's invalid */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY) || + (((ULONG_PTR)Ptr & 0x7) != 0) || + (HeapEntry->SegmentOffset >= HEAP_SEGMENTS)) + { + /* This is an invalid block */ + DPRINT1("HEAP: Trying to free an invalid address %p!\n", Ptr); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + _SEH2_YIELD(return FALSE); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* This is an invalid block */ + /* The pointer was invalid */ DPRINT1("HEAP: Trying to free an invalid address %p!\n", Ptr); RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + _SEH2_YIELD(return FALSE); + } - /* Release the heap lock */ - if (Locked) RtlLeaveHeapLock(Heap->LockVariable); - return FALSE; + /* Lock if necessary */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable, TRUE); + Locked = TRUE; } if (HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC)

5 years, 7 months

[reactos] 03/03: [CMLIB] Assign a signature to the in-memory HHIVE registry hive structure. CORE-15753

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ddf59e1ed62a55f4d4f3… commit 3ddf59e1ed62a55f4d4f327eadda91a9a958bc49 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 17 01:10:27 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 17 01:21:37 2019 +0100 [CMLIB] Assign a signature to the in-memory HHIVE registry hive structure. CORE-15753 Makes the `!reg hivelist` WinDbg command working in ReactOS. Dedicated to Mark Jansen. See for more details: https://webcache.googleusercontent.com/search?q=cache:fmHJX9eFGkkJ:https://… and http://moyix.blogspot.com/2008/02/enumerating-registry-hives.html --- sdk/lib/cmlib/hivedata.h | 1 + sdk/lib/cmlib/hiveinit.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/lib/cmlib/hivedata.h b/sdk/lib/cmlib/hivedata.h index 1c180a6da4..39d617ccbd 100644 --- a/sdk/lib/cmlib/hivedata.h +++ b/sdk/lib/cmlib/hivedata.h @@ -47,6 +47,7 @@ // // Hive structure identifiers // +#define HV_HHIVE_SIGNATURE 0xbee0bee0 #define HV_HBLOCK_SIGNATURE 0x66676572 // "regf" #define HV_HBIN_SIGNATURE 0x6e696268 // "hbin" diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index 297ae36037..fcbbe08961 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -542,6 +542,7 @@ HvInitialize( */ RtlZeroMemory(Hive, sizeof(HHIVE)); + Hive->Signature = HV_HHIVE_SIGNATURE; Hive->Allocate = Allocate; Hive->Free = Free;

5 years, 7 months

[reactos] 02/03: [CMLIB] Minor code style changes only: Use slightly more explicit signature #define names so that we know to which hive structure they correspond.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70180ee06ae1778c630a8… commit 70180ee06ae1778c630a8387827a342774bbca72 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 17 01:07:56 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 17 01:21:36 2019 +0100 [CMLIB] Minor code style changes only: Use slightly more explicit signature #define names so that we know to which hive structure they correspond. --- sdk/lib/cmlib/hivebin.c | 2 +- sdk/lib/cmlib/hivedata.h | 16 ++++++++++++---- sdk/lib/cmlib/hiveinit.c | 8 ++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sdk/lib/cmlib/hivebin.c b/sdk/lib/cmlib/hivebin.c index f3e33028c3..23ca9cb18b 100644 --- a/sdk/lib/cmlib/hivebin.c +++ b/sdk/lib/cmlib/hivebin.c @@ -31,7 +31,7 @@ HvpAddBin( return NULL; RtlZeroMemory(Bin, BinSize); - Bin->Signature = HV_BIN_SIGNATURE; + Bin->Signature = HV_HBIN_SIGNATURE; Bin->FileOffset = RegistryHive->Storage[Storage].Length * HBLOCK_SIZE; Bin->Size = (ULONG)BinSize; diff --git a/sdk/lib/cmlib/hivedata.h b/sdk/lib/cmlib/hivedata.h index 4ac381b4f8..1c180a6da4 100644 --- a/sdk/lib/cmlib/hivedata.h +++ b/sdk/lib/cmlib/hivedata.h @@ -43,8 +43,12 @@ #define HSECTOR_COUNT 8 #define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) -#define HV_SIGNATURE 0x66676572 // "regf" -#define HV_BIN_SIGNATURE 0x6e696268 // "hbin" + +// +// Hive structure identifiers +// +#define HV_HBLOCK_SIGNATURE 0x66676572 // "regf" +#define HV_HBIN_SIGNATURE 0x6e696268 // "hbin" // // Hive versions @@ -110,7 +114,7 @@ typedef enum typedef struct _HBASE_BLOCK { - /* Hive identifier "regf" (0x66676572) */ + /* Hive base block identifier "regf" (0x66676572) */ ULONG Signature; /* Update counters */ @@ -161,7 +165,7 @@ C_ASSERT(sizeof(HBASE_BLOCK) == HBLOCK_SIZE); typedef struct _HBIN { - /* Bin identifier "hbin" (0x6E696268) */ + /* Hive bin identifier "hbin" (0x6E696268) */ ULONG Signature; /* Block offset of this bin */ @@ -279,7 +283,10 @@ typedef struct _DUAL typedef struct _HHIVE { + /* Hive identifier (0xBEE0BEE0) */ ULONG Signature; + + /* Callbacks */ PGET_CELL_ROUTINE GetCellRoutine; PRELEASE_CELL_ROUTINE ReleaseCellRoutine; PALLOCATE_ROUTINE Allocate; @@ -288,6 +295,7 @@ typedef struct _HHIVE PFILE_WRITE_ROUTINE FileWrite; PFILE_READ_ROUTINE FileRead; PFILE_FLUSH_ROUTINE FileFlush; + #if (NTDDI_VERSION >= NTDDI_WIN7) PVOID HiveLoadFailure; // PHIVE_LOAD_FAILURE #endif diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index 1ad182cd38..297ae36037 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -18,7 +18,7 @@ BOOLEAN CMAPI HvpVerifyHiveHeader( IN PHBASE_BLOCK BaseBlock) { - if (BaseBlock->Signature != HV_SIGNATURE || + if (BaseBlock->Signature != HV_HBLOCK_SIGNATURE || BaseBlock->Major != HSYS_MAJOR || BaseBlock->Minor < HSYS_MINOR || BaseBlock->Type != HFILE_TYPE_PRIMARY || @@ -29,7 +29,7 @@ HvpVerifyHiveHeader( { DPRINT1("Verify Hive Header failed:\n"); DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", - BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); + BaseBlock->Signature, HV_HBLOCK_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); DPRINT1(" Minor: 0x%x expected to be >= 0x%x; Type: 0x%x, expected 0x%x\n", BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", @@ -172,7 +172,7 @@ HvpCreateHive( /* Clear it */ RtlZeroMemory(BaseBlock, RegistryHive->BaseBlockAlloc); - BaseBlock->Signature = HV_SIGNATURE; + BaseBlock->Signature = HV_HBLOCK_SIGNATURE; BaseBlock->Major = HSYS_MAJOR; BaseBlock->Minor = HSYS_MINOR; BaseBlock->Type = HFILE_TYPE_PRIMARY; @@ -270,7 +270,7 @@ HvpInitializeMemoryHive( for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) { Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); - if (Bin->Signature != HV_BIN_SIGNATURE || + if (Bin->Signature != HV_HBIN_SIGNATURE || (Bin->Size % HBLOCK_SIZE) != 0) { DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n",

5 years, 7 months

[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

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);

5 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

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