Ros-diffs

ros-diffs@reactos.org

81390 discussions

03/03: [EXPLORER] CTrayWindow: Set the initial lock state in the band site This alongside the previous commit, fix locking and unlocking the taskbar.
by Giannis Adamopoulos 28 Feb '18

28 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b95fff5bce3c706df3a55… commit b95fff5bce3c706df3a551162d7209c60f4fd615 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 28 17:14:00 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 28 17:21:19 2018 +0200 [EXPLORER] CTrayWindow: Set the initial lock state in the band site This alongside the previous commit, fix locking and unlocking the taskbar. --- base/shell/explorer/traywnd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index bf71ad0e17..a3c1f3670f 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2080,6 +2080,9 @@ ChangePos: SetTimer(TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); } + /* Set the initial lock state in the band site */ + m_TrayBandSite->Lock(g_TaskbarSettings.bLock); + RegisterHotKey(m_hWnd, IDHK_RUN, MOD_WIN, 'R'); RegisterHotKey(m_hWnd, IDHK_MINIMIZE_ALL, MOD_WIN, 'M'); RegisterHotKey(m_hWnd, IDHK_RESTORE_ALL, MOD_WIN|MOD_SHIFT, 'M');

1 0

02/03: [BROWSEUI] CBandSite: Implement SetBandSiteInfo and GetBandSiteInfo Only BSIS_LOCKED, BSIS_NOGRIPPER, BSIS_ALWAYSGRIPPER and BSIS_NOCAPTION supported so far.
by Giannis Adamopoulos 28 Feb '18

28 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d4a091b4a3781d82bd05… commit 6d4a091b4a3781d82bd05334c7a5e30991ea1e1c Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 28 17:16:46 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 28 17:20:46 2018 +0200 [BROWSEUI] CBandSite: Implement SetBandSiteInfo and GetBandSiteInfo Only BSIS_LOCKED, BSIS_NOGRIPPER, BSIS_ALWAYSGRIPPER and BSIS_NOCAPTION supported so far. --- dll/win32/browseui/shellbars/CBandSite.cpp | 187 ++++++++++++++++------------- dll/win32/browseui/shellbars/CBandSite.h | 2 + 2 files changed, 104 insertions(+), 85 deletions(-) diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index e807c5d163..13f78a2b94 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -40,7 +40,9 @@ CBandSiteBase::CBandSiteBase(): m_cBands(0), m_cBandsAllocated(0), m_bands(NULL), - m_hwndRebar(NULL) + m_hwndRebar(NULL), + m_dwState(0), + m_dwStyle(0) { } @@ -146,13 +148,13 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi prbi->fStyle |= RBBS_BREAK; if (Band->dbi.dwModeFlags & DBIMF_TOPALIGN) prbi->fStyle |= RBBS_TOPALIGN; - if (Band->dbi.dwModeFlags & DBIMF_NOGRIPPER) + if ((Band->dbi.dwModeFlags & DBIMF_NOGRIPPER) || (m_dwStyle & BSIS_NOGRIPPER)) prbi->fStyle |= RBBS_NOGRIPPER; - if (Band->dbi.dwModeFlags & DBIMF_ALWAYSGRIPPER) + if ((Band->dbi.dwModeFlags & DBIMF_ALWAYSGRIPPER) || (m_dwStyle & BSIS_ALWAYSGRIPPER)) prbi->fStyle |= RBBS_GRIPPERALWAYS; } - if (Band->bHiddenTitle) + if (Band->bHiddenTitle || (m_dwStyle & BSIS_NOCAPTION)) { prbi->fMask |= RBBIM_STYLE; prbi->fStyle |= RBBS_HIDETITLE; @@ -295,27 +297,30 @@ HRESULT CBandSiteBase::_OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA } } - /* Load the static part of the menu */ - HMENU hMenuStatic = LoadMenuW(GetModuleHandleW(L"browseui.dll"), MAKEINTRESOURCEW(IDM_BAND_MENU)); - - if (hMenuStatic) + if (!(m_dwStyle & BSIS_LOCKED)) { - Shell_MergeMenus(hMenu, hMenuStatic, UINT_MAX, 0, UINT_MAX, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS); + /* Load the static part of the menu */ + HMENU hMenuStatic = LoadMenuW(GetModuleHandleW(L"browseui.dll"), MAKEINTRESOURCEW(IDM_BAND_MENU)); - ::DestroyMenu(hMenuStatic); + if (hMenuStatic) + { + Shell_MergeMenus(hMenu, hMenuStatic, UINT_MAX, 0, UINT_MAX, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS); - hr = _IsBandDeletable(dwBandID); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + ::DestroyMenu(hMenuStatic); - /* Remove the close item if it is not deletable */ - if (hr == S_FALSE || (Band->dbi.dwModeFlags & DBIMF_UNDELETEABLE) != 0) - DeleteMenu(hMenu, IDM_BAND_CLOSE, MF_BYCOMMAND); + hr = _IsBandDeletable(dwBandID); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - if ((Band->dbi.dwMask & DBIM_TITLE) == 0) - DeleteMenu(hMenu, IDM_BAND_TITLE, MF_BYCOMMAND); - else - CheckMenuItem(hMenu, IDM_BAND_TITLE, Band->bHiddenTitle ? MF_UNCHECKED : MF_CHECKED); + /* Remove the close item if it is not deletable */ + if (hr == S_FALSE || (Band->dbi.dwModeFlags & DBIMF_UNDELETEABLE) != 0) + DeleteMenu(hMenu, IDM_BAND_CLOSE, MF_BYCOMMAND); + + if ((Band->dbi.dwMask & DBIM_TITLE) == 0) + DeleteMenu(hMenu, IDM_BAND_TITLE, MF_BYCOMMAND); + else + CheckMenuItem(hMenu, IDM_BAND_TITLE, Band->bHiddenTitle ? MF_UNCHECKED : MF_CHECKED); + } } /* TODO: Query the menu of our site */ @@ -412,19 +417,21 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) return E_FAIL; hRet = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &DeskBand)); - if (!SUCCEEDED(hRet) || DeskBand == NULL) - goto Cleanup; + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + hRet = punk->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ObjWithSite)); - if (!SUCCEEDED(hRet) || ObjWithSite == NULL) - goto Cleanup; + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + hRet = punk->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow)); - if (!SUCCEEDED(hRet) || OleWindow == NULL) - goto Cleanup; + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + hRet = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &WndEvtHandler)); - if (!SUCCEEDED(hRet) || WndEvtHandler == NULL) - goto Cleanup; + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; - hRet = S_OK; if (m_cBandsAllocated > m_cBands) { /* Search for a free band object */ @@ -447,16 +454,14 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) NewAllocated = 0xFFFF; if (NewAllocated == m_cBandsAllocated) { - hRet = E_OUTOFMEMORY; - goto Cleanup; + return E_OUTOFMEMORY; } NewBand = static_cast<struct BandObject *>(CoTaskMemAlloc(NewAllocated * sizeof(struct BandObject))); if (NewBand == NULL) { - hRet = E_OUTOFMEMORY; - goto Cleanup; + return E_OUTOFMEMORY; } /* Copy the old array */ @@ -479,8 +484,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) m_bands = static_cast<struct BandObject *>(CoTaskMemAlloc(8 * sizeof(struct BandObject))); if (m_bands == NULL) { - hRet = E_OUTOFMEMORY; - goto Cleanup; + return E_OUTOFMEMORY; } /* Initialize the added bands */ @@ -490,67 +494,65 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) NewBand = &m_bands[0]; } - if (SUCCEEDED(hRet)) - { - ASSERT(NewBand != NULL); + ASSERT(NewBand != NULL); - m_cBands++; - NewBand->DeskBand = DeskBand.Detach(); - NewBand->OleWindow = OleWindow.Detach(); - NewBand->WndEvtHandler = WndEvtHandler.Detach(); + m_cBands++; + NewBand->DeskBand = DeskBand.Detach(); + NewBand->OleWindow = OleWindow.Detach(); + NewBand->WndEvtHandler = WndEvtHandler.Detach(); - /* Create the ReBar band */ - hRet = ObjWithSite->SetSite(static_cast<IOleWindow *>(this)); - if (SUCCEEDED(hRet)) + /* Create the ReBar band */ + hRet = ObjWithSite->SetSite(static_cast<IOleWindow *>(this)); + if (SUCCEEDED(hRet)) + { + uBand = 0xffffffff; + if (SUCCEEDED(_UpdateBand(NewBand))) { - uBand = 0xffffffff; - if (SUCCEEDED(_UpdateBand(NewBand))) + if (NewBand->dbi.dwMask & DBIM_MODEFLAGS) { - if (NewBand->dbi.dwMask & DBIM_MODEFLAGS) - { - if (NewBand->dbi.dwModeFlags & DBIMF_ADDTOFRONT) - uBand = 0; - } + if (NewBand->dbi.dwModeFlags & DBIMF_ADDTOFRONT) + uBand = 0; } + } - _BuildBandInfo(NewBand, &rbi); + _BuildBandInfo(NewBand, &rbi); - if (SUCCEEDED(NewBand->OleWindow->GetWindow(&rbi.hwndChild)) && - rbi.hwndChild != NULL) - { - rbi.fMask |= RBBIM_CHILD; - WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); - } + if (SUCCEEDED(NewBand->OleWindow->GetWindow(&rbi.hwndChild)) && + rbi.hwndChild != NULL) + { + rbi.fMask |= RBBIM_CHILD; + WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); + } - if (!SendMessageW(m_hwndRebar, RB_INSERTBANDW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) - return E_FAIL; + if (!SendMessageW(m_hwndRebar, RB_INSERTBANDW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) + return E_FAIL; - hRet = (HRESULT)((USHORT)_GetBandID(NewBand)); - } - else - { - WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); + hRet = (HRESULT)((USHORT)_GetBandID(NewBand)); - /* Remove the band from the ReBar control */ - _BuildBandInfo(NewBand, &rbi); - uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); - if (uBand != (UINT)-1) + _UpdateAllBands(); + } + else + { + WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); + + /* Remove the band from the ReBar control */ + _BuildBandInfo(NewBand, &rbi); + uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); + if (uBand != (UINT)-1) + { + if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0)) { - if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0)) - { - ERR("Failed to delete band!\n"); - } + ERR("Failed to delete band!\n"); } - else - ERR("Failed to map band id to index!\n"); + } + else + ERR("Failed to map band id to index!\n"); - _FreeBand(NewBand); + _FreeBand(NewBand); - hRet = E_FAIL; - /* goto Cleanup; */ - } + hRet = E_FAIL; } -Cleanup: + return hRet; } @@ -675,14 +677,29 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandObject(DWORD dwBandID, REFIID ri HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) { - FIXME("(%p, %p)\n", this, pbsinfo); - return E_NOTIMPL; + if (!pbsinfo) + return E_INVALIDARG; + + if ((pbsinfo->dwMask & BSIM_STATE)) + m_dwState = pbsinfo->dwState; + if ((pbsinfo->dwMask & BSIM_STYLE)) + m_dwStyle = pbsinfo->dwStyle; + + _UpdateAllBands(); + return S_OK; } HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo) { - FIXME("(%p, %p)\n", this, pbsinfo); - return E_NOTIMPL; + if (!pbsinfo) + return E_INVALIDARG; + + if ((pbsinfo->dwMask & BSIM_STATE)) + pbsinfo->dwState = m_dwState; + if ((pbsinfo->dwMask & BSIM_STYLE)) + pbsinfo->dwStyle = m_dwStyle; + + return S_OK; } HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) diff --git a/dll/win32/browseui/shellbars/CBandSite.h b/dll/win32/browseui/shellbars/CBandSite.h index df38f0438b..be2245089e 100644 --- a/dll/win32/browseui/shellbars/CBandSite.h +++ b/dll/win32/browseui/shellbars/CBandSite.h @@ -54,6 +54,8 @@ private: struct BandObject *m_bands; HWND m_hwndRebar; CComPtr<IOleWindow> m_site; + DWORD m_dwState; /* BSSF_ flags */ + DWORD m_dwStyle; /* BSIS_ flags */ public: CBandSiteBase(); ~CBandSiteBase();

1 0

01/03: [BROWSEUI] CBandSite: Style fixes
by Giannis Adamopoulos 28 Feb '18

28 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6785192fe697b899cd7ef… commit 6785192fe697b899cd7efe3e26018ef0d6674368 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 28 16:22:37 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 28 17:20:44 2018 +0200 [BROWSEUI] CBandSite: Style fixes --- dll/win32/browseui/shellbars/CBandSite.cpp | 244 ++++++++++++++--------------- dll/win32/browseui/shellbars/CBandSite.h | 30 ++-- 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 5bf195ec89..e807c5d163 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -36,31 +36,31 @@ TODO: ** The chevron should be shown only when needed */ -CBandSiteBase::CBandSiteBase() +CBandSiteBase::CBandSiteBase(): + m_cBands(0), + m_cBandsAllocated(0), + m_bands(NULL), + m_hwndRebar(NULL) { - fBandsCount = 0; - fBandsAllocated = 0; - fBands = NULL; - fRebarWindow = NULL; } -UINT CBandSiteBase::GetBandID(struct BandObject *Band) +UINT CBandSiteBase::_GetBandID(struct BandObject *Band) { - return (UINT)(Band - fBands); + return (UINT)(Band - m_bands); } -struct CBandSiteBase::BandObject *CBandSiteBase::GetBandByID(DWORD dwBandID) +struct CBandSiteBase::BandObject *CBandSiteBase::_GetBandByID(DWORD dwBandID) { - if ((LONG)dwBandID >= fBandsAllocated) + if ((LONG)dwBandID >= m_cBandsAllocated) return NULL; - if (fBands[dwBandID].DeskBand == NULL) + if (m_bands[dwBandID].DeskBand == NULL) return NULL; - return &fBands[dwBandID]; + return &m_bands[dwBandID]; } -void CBandSiteBase::FreeBand(struct BandObject *Band) +void CBandSiteBase::_FreeBand(struct BandObject *Band) { ATLASSERT(Band->DeskBand != NULL); ATLASSERT(Band->OleWindow != NULL); @@ -69,15 +69,15 @@ void CBandSiteBase::FreeBand(struct BandObject *Band) Band->OleWindow->Release(); Band->WndEvtHandler->Release(); memset(Band, 0, sizeof(*Band)); - fBandsCount--; + m_cBands--; } -DWORD CBandSiteBase::GetBandSiteViewMode() +DWORD CBandSiteBase::_GetViewMode() { DWORD dwStyle; /* FIXME: What about DBIF_VIEWMODE_FLOATING and DBIF_VIEWMODE_TRANSPARENT? */ - dwStyle = GetWindowLongPtr(fRebarWindow, GWL_STYLE); + dwStyle = GetWindowLongPtr(m_hwndRebar, GWL_STYLE); if (dwStyle & CCS_VERT) return DBIF_VIEWMODE_VERTICAL; @@ -85,13 +85,13 @@ DWORD CBandSiteBase::GetBandSiteViewMode() return DBIF_VIEWMODE_NORMAL; } -VOID CBandSiteBase::BuildRebarBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi) +VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi) { ZeroMemory(prbi, sizeof(*prbi)); prbi->cbSize = sizeof(*prbi); prbi->fMask = RBBIM_ID; - prbi->wID = GetBandID(Band); + prbi->wID = _GetBandID(Band); if (Band->dbi.dwMask & DBIM_MINSIZE) { @@ -167,7 +167,7 @@ VOID CBandSiteBase::BuildRebarBandInfo(struct BandObject *Band, REBARBANDINFOW * } } -HRESULT CBandSiteBase::UpdateSingleBand(struct BandObject *Band) +HRESULT CBandSiteBase::_UpdateBand(struct BandObject *Band) { REBARBANDINFOW rbi; DWORD dwViewMode; @@ -178,12 +178,12 @@ HRESULT CBandSiteBase::UpdateSingleBand(struct BandObject *Band) Band->dbi.dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; - dwViewMode = GetBandSiteViewMode(); + dwViewMode = _GetViewMode(); - hRet = Band->DeskBand->GetBandInfo((DWORD)GetBandID(Band), dwViewMode, &Band->dbi); + hRet = Band->DeskBand->GetBandInfo((DWORD)_GetBandID(Band), dwViewMode, &Band->dbi); if (SUCCEEDED(hRet)) { - BuildRebarBandInfo(Band, &rbi); + _BuildBandInfo(Band, &rbi); if (SUCCEEDED(Band->OleWindow->GetWindow(&rbi.hwndChild)) && rbi.hwndChild != NULL) { @@ -191,10 +191,10 @@ HRESULT CBandSiteBase::UpdateSingleBand(struct BandObject *Band) WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); } - uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); + uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); if (uBand != (UINT)-1) { - if (!SendMessageW(fRebarWindow, RB_SETBANDINFOW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) + if (!SendMessageW(m_hwndRebar, RB_SETBANDINFOW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) { WARN("Failed to update the rebar band!\n"); } @@ -207,16 +207,16 @@ HRESULT CBandSiteBase::UpdateSingleBand(struct BandObject *Band) return hRet; } -HRESULT CBandSiteBase::UpdateAllBands() +HRESULT CBandSiteBase::_UpdateAllBands() { LONG i; HRESULT hRet; - for (i = 0; i < fBandsAllocated; i++) + for (i = 0; i < m_cBandsAllocated; i++) { - if (fBands[i].DeskBand != NULL) + if (m_bands[i].DeskBand != NULL) { - hRet = UpdateSingleBand(&fBands[i]); + hRet = _UpdateBand(&m_bands[i]); if (FAILED_UNEXPECTEDLY(hRet)) return hRet; } @@ -225,15 +225,15 @@ HRESULT CBandSiteBase::UpdateAllBands() return S_OK; } -HRESULT CBandSiteBase::UpdateBand(DWORD dwBandID) +HRESULT CBandSiteBase::_UpdateBand(DWORD dwBandID) { struct BandObject *Band; - Band = GetBandByID(dwBandID); + Band = _GetBandByID(dwBandID); if (Band == NULL) return E_FAIL; - return UpdateSingleBand(Band); + return _UpdateBand(Band); } HRESULT CBandSiteBase::_IsBandDeletable(DWORD dwBandID) @@ -253,15 +253,15 @@ HRESULT CBandSiteBase::_IsBandDeletable(DWORD dwBandID) return ((dwState & BSSF_UNDELETEABLE) != 0) ? S_FALSE : S_OK; } -HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) +HRESULT CBandSiteBase::_OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) { /* Find the index fo the band that was clicked */ int x = GET_X_LPARAM(lParam); int y = GET_Y_LPARAM(lParam); RBHITTESTINFO htInfo = {{x, y}}; - ScreenToClient(fRebarWindow, &htInfo.pt); - int iBand = SendMessageW(fRebarWindow, RB_HITTEST, 0, (LPARAM)&htInfo); + ScreenToClient(m_hwndRebar, &htInfo.pt); + int iBand = SendMessageW(m_hwndRebar, RB_HITTEST, 0, (LPARAM)&htInfo); if (iBand < 0) { /* FIXME: what to do here? */ @@ -270,11 +270,11 @@ HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM /* Now get the id of the band that was clicked */ REBARBANDINFOW bandInfo = {sizeof(bandInfo), RBBIM_ID}; - SendMessageW(fRebarWindow, RB_GETBANDINFOW, htInfo.iBand, (LPARAM)&bandInfo); + SendMessageW(m_hwndRebar, RB_GETBANDINFOW, htInfo.iBand, (LPARAM)&bandInfo); /* Finally get the band */ DWORD dwBandID = bandInfo.wID; - struct BandObject *Band = GetBandByID(dwBandID); + struct BandObject *Band = _GetBandByID(dwBandID); if (Band == NULL) return E_FAIL; @@ -320,10 +320,10 @@ HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM /* TODO: Query the menu of our site */ - UINT uCommand = ::TrackPopupMenuEx(hMenu, TPM_RETURNCMD, x, y, fRebarWindow, NULL); + UINT uCommand = ::TrackPopupMenuEx(hMenu, TPM_RETURNCMD, x, y, m_hwndRebar, NULL); if (uCommand < idBandLast) { - CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, fRebarWindow, MAKEINTRESOURCEA(uCommand)}; + CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, m_hwndRebar, MAKEINTRESOURCEA(uCommand)}; hr = pcm->InvokeCommand(&cmi); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -334,7 +334,7 @@ HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM { Band->bHiddenTitle = !Band->bHiddenTitle; - hr = UpdateBand(dwBandID); + hr = _UpdateBand(dwBandID); if (FAILED_UNEXPECTEDLY(hr)) return hr; } @@ -349,22 +349,22 @@ HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return S_OK; } -struct CBandSiteBase::BandObject *CBandSiteBase::GetBandFromHwnd(HWND hwnd) +struct CBandSiteBase::BandObject *CBandSiteBase::_GetBandFromHwnd(HWND hwnd) { HRESULT hRet; HWND hWndBand; LONG i; - for (i = 0; i < fBandsAllocated; i++) + for (i = 0; i < m_cBandsAllocated; i++) { - if (fBands[i].DeskBand != NULL) + if (m_bands[i].DeskBand != NULL) { - ASSERT(fBands[i].OleWindow); + ASSERT(m_bands[i].OleWindow); hWndBand = NULL; - hRet = fBands[i].OleWindow->GetWindow(&hWndBand); + hRet = m_bands[i].OleWindow->GetWindow(&hWndBand); if (SUCCEEDED(hRet) && hWndBand == hwnd) - return &fBands[i]; + return &m_bands[i]; } } @@ -376,21 +376,21 @@ CBandSiteBase::~CBandSiteBase() TRACE("destroying %p\n", this); - if (fRebarWindow != NULL) + if (m_hwndRebar != NULL) { - DestroyWindow(fRebarWindow); - fRebarWindow = NULL; + DestroyWindow(m_hwndRebar); + m_hwndRebar = NULL; } - if (fBands != NULL) + if (m_bands != NULL) { - for (INT i = 0; i < fBandsAllocated; i++) + for (INT i = 0; i < m_cBandsAllocated; i++) { - if (fBands[i].DeskBand != NULL) - FreeBand(&fBands[i]); + if (m_bands[i].DeskBand != NULL) + _FreeBand(&m_bands[i]); } - CoTaskMemFree(fBands); - fBands = NULL; + CoTaskMemFree(m_bands); + m_bands = NULL; } } @@ -408,7 +408,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) TRACE("(%p, %p)\n", this, punk); - if (punk == NULL || fRebarWindow == NULL) + if (punk == NULL || m_hwndRebar == NULL) return E_FAIL; hRet = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &DeskBand)); @@ -425,27 +425,27 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) goto Cleanup; hRet = S_OK; - if (fBandsAllocated > fBandsCount) + if (m_cBandsAllocated > m_cBands) { /* Search for a free band object */ - for (INT i = 0; i < fBandsAllocated; i++) + for (INT i = 0; i < m_cBandsAllocated; i++) { - if (fBands[i].DeskBand == NULL) + if (m_bands[i].DeskBand == NULL) { - NewBand = &fBands[i]; + NewBand = &m_bands[i]; break; } } } - else if (fBandsAllocated > 0) + else if (m_cBandsAllocated > 0) { - ASSERT (fBands != NULL); + ASSERT (m_bands != NULL); /* Reallocate the band object array */ - NewAllocated = fBandsAllocated + 8; + NewAllocated = m_cBandsAllocated + 8; if (NewAllocated > 0xFFFF) NewAllocated = 0xFFFF; - if (NewAllocated == fBandsAllocated) + if (NewAllocated == m_cBandsAllocated) { hRet = E_OUTOFMEMORY; goto Cleanup; @@ -460,41 +460,41 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) } /* Copy the old array */ - memcpy(NewBand, fBands, fBandsAllocated * sizeof(struct BandObject)); + memcpy(NewBand, m_bands, m_cBandsAllocated * sizeof(struct BandObject)); /* Initialize the added bands */ - memset(&NewBand[fBandsAllocated], 0, (NewAllocated - fBandsAllocated) * sizeof(struct BandObject)); + memset(&NewBand[m_cBandsAllocated], 0, (NewAllocated - m_cBandsAllocated) * sizeof(struct BandObject)); - fBandsAllocated = NewAllocated; - CoTaskMemFree(fBands); - fBands = NewBand; + m_cBandsAllocated = NewAllocated; + CoTaskMemFree(m_bands); + m_bands = NewBand; } else { - ASSERT(fBands == NULL); - ASSERT(fBandsAllocated == 0); - ASSERT(fBandsCount == 0); + ASSERT(m_bands == NULL); + ASSERT(m_cBandsAllocated == 0); + ASSERT(m_cBands == 0); /* Allocate new array */ - fBands = static_cast<struct BandObject *>(CoTaskMemAlloc(8 * sizeof(struct BandObject))); - if (fBands == NULL) + m_bands = static_cast<struct BandObject *>(CoTaskMemAlloc(8 * sizeof(struct BandObject))); + if (m_bands == NULL) { hRet = E_OUTOFMEMORY; goto Cleanup; } /* Initialize the added bands */ - memset(fBands, 0, 8 * sizeof(struct BandObject)); + memset(m_bands, 0, 8 * sizeof(struct BandObject)); - fBandsAllocated += 8; - NewBand = &fBands[0]; + m_cBandsAllocated += 8; + NewBand = &m_bands[0]; } if (SUCCEEDED(hRet)) { ASSERT(NewBand != NULL); - fBandsCount++; + m_cBands++; NewBand->DeskBand = DeskBand.Detach(); NewBand->OleWindow = OleWindow.Detach(); NewBand->WndEvtHandler = WndEvtHandler.Detach(); @@ -504,7 +504,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) if (SUCCEEDED(hRet)) { uBand = 0xffffffff; - if (SUCCEEDED(UpdateSingleBand(NewBand))) + if (SUCCEEDED(_UpdateBand(NewBand))) { if (NewBand->dbi.dwMask & DBIM_MODEFLAGS) { @@ -513,7 +513,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) } } - BuildRebarBandInfo(NewBand, &rbi); + _BuildBandInfo(NewBand, &rbi); if (SUCCEEDED(NewBand->OleWindow->GetWindow(&rbi.hwndChild)) && rbi.hwndChild != NULL) @@ -522,21 +522,21 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); } - if (!SendMessageW(fRebarWindow, RB_INSERTBANDW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) + if (!SendMessageW(m_hwndRebar, RB_INSERTBANDW, (WPARAM)uBand, reinterpret_cast<LPARAM>(&rbi))) return E_FAIL; - hRet = (HRESULT)((USHORT)GetBandID(NewBand)); + hRet = (HRESULT)((USHORT)_GetBandID(NewBand)); } else { WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); /* Remove the band from the ReBar control */ - BuildRebarBandInfo(NewBand, &rbi); - uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); + _BuildBandInfo(NewBand, &rbi); + uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); if (uBand != (UINT)-1) { - if (!SendMessageW(fRebarWindow, RB_DELETEBAND, (WPARAM)uBand, 0)) + if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0)) { ERR("Failed to delete band!\n"); } @@ -544,7 +544,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) else ERR("Failed to map band id to index!\n"); - FreeBand(NewBand); + _FreeBand(NewBand); hRet = E_FAIL; /* goto Cleanup; */ @@ -561,14 +561,14 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::EnumBands(UINT uBand, DWORD *pdwBandID) TRACE("(%p, %u, %p)\n", this, uBand, pdwBandID); if (uBand == 0xffffffff) - return (UINT)fBandsCount; + return (UINT)m_cBands; - if (uBand >= (UINT)fBandsCount) + if (uBand >= (UINT)m_cBands) return E_FAIL; - for (i = 0; i < (DWORD)fBandsAllocated; i++) + for (i = 0; i < (DWORD)m_cBandsAllocated; i++) { - if (fBands[i].DeskBand != NULL) + if (m_bands[i].DeskBand != NULL) { if (uBand == 0) { @@ -590,7 +590,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryBand(DWORD dwBandID, IDeskBand **p TRACE("(%p, %u, %p, %p, %p, %d)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); - Band = GetBandByID(dwBandID); + Band = _GetBandByID(dwBandID); if (Band == NULL) return E_FAIL; @@ -620,7 +620,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandState(DWORD dwBandID, DWORD dwMa TRACE("(%p, %u, %x, %x)\n", this, dwBandID, dwMask, dwState); - Band = GetBandByID(dwBandID); + Band = _GetBandByID(dwBandID); if (Band == NULL) return E_FAIL; @@ -635,17 +635,17 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::RemoveBand(DWORD dwBandID) TRACE("(%p, %u)\n", this, dwBandID); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; - Band = GetBandByID(dwBandID); + Band = _GetBandByID(dwBandID); if (Band == NULL) return E_FAIL; - uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)GetBandID(Band), 0); + uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)_GetBandID(Band), 0); if (uBand != (UINT)-1) { - if (!SendMessageW(fRebarWindow, RB_DELETEBAND, (WPARAM)uBand, 0)) + if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0)) { ERR("Could not delete band!\n"); } @@ -653,7 +653,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::RemoveBand(DWORD dwBandID) else ERR("Could not map band id to index!\n"); - FreeBand(Band); + _FreeBand(Band); return S_OK; } @@ -663,7 +663,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandObject(DWORD dwBandID, REFIID ri TRACE("(%p, %u, %s, %p)\n", this, dwBandID, debugstr_guid(&riid), ppv); - Band = GetBandByID(dwBandID); + Band = _GetBandByID(dwBandID); if (Band == NULL) { *ppv = NULL; @@ -692,12 +692,12 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM TRACE("(%p, %p, %u, %p, %p, %p)\n", this, hWnd, uMsg, wParam, lParam, plrResult); *plrResult = 0; - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; if (uMsg == WM_CONTEXTMENU) { - HRESULT hr = OnContextMenu(hWnd, uMsg, wParam, lParam, plrResult); + HRESULT hr = _OnContextMenu(hWnd, uMsg, wParam, lParam, plrResult); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -710,20 +710,20 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM else if (uMsg == WM_NOTIFY) { NMHDR* pnmhdr = reinterpret_cast<NMHDR*>(lParam); - if (pnmhdr->hwndFrom != fRebarWindow) + if (pnmhdr->hwndFrom != m_hwndRebar) { hWnd = pnmhdr->hwndFrom; } else { - for (int i = 0; i < fBandsAllocated; i++) + for (int i = 0; i < m_cBandsAllocated; i++) { - if (fBands[i].WndEvtHandler && fBands[i].OleWindow) + if (m_bands[i].WndEvtHandler && m_bands[i].OleWindow) { HWND hwndBand; - if (SUCCEEDED(fBands[i].OleWindow->GetWindow(&hwndBand))) + if (SUCCEEDED(m_bands[i].OleWindow->GetWindow(&hwndBand))) { - fBands[i].WndEvtHandler->OnWinEvent(hwndBand, uMsg, wParam, lParam, plrResult); + m_bands[i].WndEvtHandler->OnWinEvent(hwndBand, uMsg, wParam, lParam, plrResult); } } } @@ -731,7 +731,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM } } - Band = GetBandFromHwnd(hWnd); + Band = _GetBandFromHwnd(hWnd); if (Band != NULL) { return Band->WndEvtHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, plrResult); @@ -746,10 +746,10 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::IsWindowOwner(HWND hWnd) TRACE("(%p, %p)\n", this, hWnd); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; - Band = GetBandFromHwnd(hWnd); + Band = _GetBandFromHwnd(hWnd); if (Band != NULL) return S_OK; @@ -760,8 +760,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetWindow(HWND *phWnd) { TRACE("(%p, %p)\n", this, phWnd); - *phWnd = fRebarWindow; - if (fRebarWindow != NULL) + *phWnd = m_hwndRebar; + if (m_hwndRebar != NULL) return S_OK; return E_FAIL; @@ -781,20 +781,20 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetDeskBarSite(IUnknown *pUnk) TRACE("(%p, %p)\n", this, pUnk); - fOleWindow.Release(); + m_site = NULL; - hRet = pUnk->QueryInterface(IID_PPV_ARG(IOleWindow, &fOleWindow)); + hRet = pUnk->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); if (FAILED_UNEXPECTEDLY(hRet)) return E_FAIL; - hRet = fOleWindow->GetWindow(&hWndParent); + hRet = m_site->GetWindow(&hWndParent); if (FAILED_UNEXPECTEDLY(hRet)) return E_FAIL; style = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | RBS_AUTOSIZE | RBS_BANDBORDERS | CCS_NODIVIDER | /*CCS_NORESIZE |*/ CCS_NOPARENTALIGN; - fRebarWindow = CreateWindowExW(WS_EX_TOOLWINDOW, + m_hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, style, @@ -803,9 +803,9 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetDeskBarSite(IUnknown *pUnk) NULL, _AtlBaseModule.GetModuleInstance(), NULL); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) { - fOleWindow.Release(); + m_site = NULL; WARN("IDeskbarClient::SetDeskBarSite() failed to create ReBar control!\n"); return E_FAIL; } @@ -820,10 +820,10 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetModeDBC(DWORD dwMode) TRACE("(%p, %x)\n", this, dwMode); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; - dwStyle = dwPrevStyle = GetWindowLongPtr(fRebarWindow, GWL_STYLE); + dwStyle = dwPrevStyle = GetWindowLongPtr(m_hwndRebar, GWL_STYLE); if (dwMode & DBIF_VIEWMODE_VERTICAL) dwStyle |= CCS_VERT; @@ -832,7 +832,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetModeDBC(DWORD dwMode) if (dwStyle != dwPrevStyle) { - SetWindowLongPtr(fRebarWindow, GWL_STYLE, dwPrevStyle); + SetWindowLongPtr(m_hwndRebar, GWL_STYLE, dwPrevStyle); } return S_OK; @@ -842,10 +842,10 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::UIActivateDBC(DWORD dwState) { TRACE("(%p, %x)\n", this, dwState); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; - ShowWindow(fRebarWindow, (dwState & DBC_SHOW) ? SW_SHOW : SW_HIDE); + ShowWindow(m_hwndRebar, (dwState & DBC_SHOW) ? SW_SHOW : SW_HIDE); //FIXME: Properly notify bands? return S_OK; } @@ -870,7 +870,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD n TRACE("(%p, %p, %u, %u, %p, %p)\n", this, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); - if (fRebarWindow == NULL) + if (m_hwndRebar == NULL) return E_FAIL; if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) @@ -879,12 +879,12 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD n { case DBID_BANDINFOCHANGED: if (pvaIn == NULL) - hRet = UpdateAllBands(); + hRet = _UpdateAllBands(); else { /* Update a single band */ if (pvaIn->n1.n2.vt == VT_I4) - hRet = UpdateBand(pvaIn->n1.n2.n3.lVal); + hRet = _UpdateBand(pvaIn->n1.n2.n3.lVal); else hRet = E_FAIL; } diff --git a/dll/win32/browseui/shellbars/CBandSite.h b/dll/win32/browseui/shellbars/CBandSite.h index c515fbcd05..df38f0438b 100644 --- a/dll/win32/browseui/shellbars/CBandSite.h +++ b/dll/win32/browseui/shellbars/CBandSite.h @@ -49,11 +49,11 @@ private: BOOL bHiddenTitle; }; - LONG fBandsCount; - LONG fBandsAllocated; - struct BandObject *fBands; - HWND fRebarWindow; - CComPtr<IOleWindow> fOleWindow; + LONG m_cBands; + LONG m_cBandsAllocated; + struct BandObject *m_bands; + HWND m_hwndRebar; + CComPtr<IOleWindow> m_site; public: CBandSiteBase(); ~CBandSiteBase(); @@ -117,17 +117,17 @@ public: virtual HRESULT STDMETHODCALLTYPE SaveToStreamBS(IUnknown *, IStream *); private: - UINT GetBandID(struct BandObject *Band); - struct BandObject *GetBandByID(DWORD dwBandID); - void FreeBand(struct BandObject *Band); - DWORD GetBandSiteViewMode(); - VOID BuildRebarBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi); - HRESULT UpdateSingleBand(struct BandObject *Band); - HRESULT UpdateAllBands(); - HRESULT UpdateBand(DWORD dwBandID); - struct BandObject *GetBandFromHwnd(HWND hwnd); + UINT _GetBandID(struct BandObject *Band); + struct BandObject *_GetBandByID(DWORD dwBandID); + void _FreeBand(struct BandObject *Band); + DWORD _GetViewMode(); + VOID _BuildBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi); + HRESULT _UpdateBand(struct BandObject *Band); + HRESULT _UpdateAllBands(); + HRESULT _UpdateBand(DWORD dwBandID); + struct BandObject *_GetBandFromHwnd(HWND hwnd); HRESULT _IsBandDeletable(DWORD dwBandID); - HRESULT OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult); + HRESULT _OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult); BEGIN_COM_MAP(CBandSiteBase) COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite)

1 0

01/01: [TRANSLATION] Completed German translation in taskmgr
by Simon Dräger 26 Feb '18

26 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f80d227ec20bf8b201eb5… commit f80d227ec20bf8b201eb5e0a7fb23ad802abb5b2 Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Mon Feb 26 13:32:43 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 22:20:38 2018 +0100 [TRANSLATION] Completed German translation in taskmgr --- base/applications/taskmgr/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 96505429de..1a353cbf88 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -432,11 +432,11 @@ BEGIN IDS_MSG_UNABLEDEBUGPROCESS "Kann Prozess nicht debuggen" IDS_MSG_WARNINGDEBUG "WARNUNG: Das Debuggen dieses Prozesses kann zu Datenverlust führen.\nSind Sie sicher, dass Sie diesen Prozess debuggen möchten?" IDS_MSG_TASKMGRWARNING "Warnung vom Task-Manager" - IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Abbrechen eines Prozesses kann zu\nunerwünschten Ergebnissen, einschließlich Datenverlust und\nSysteminstabilität, führen. Zustand und Daten des Prozesses\nwerden nicht mehr gespeichert. Sind Sie sicher, dass Sie\nden Prozess abbrechen möchten?" + IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Beenden eines Prozesses kann zu\nunerwünschten Ergebnissen, einschließlich Datenverlust und\nSysteminstabilität, führen. Zustand und Daten des Prozesses\nwerden nicht mehr gespeichert. Sind Sie sicher, dass Sie\nden Prozess beenden möchten?" IDS_MSG_UNABLETERMINATEPRO "Kann den Prozess nicht beenden" - IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." + IDS_MSG_CLOSESYSTEMPROCESS "Dies ist ein kritischer Systemprozess. Der Task-Manager wird diesen Prozess nicht beenden." IDS_MSG_UNABLECHANGEPRIORITY "Kann die Priorität nicht ändern" - IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität, führen.\nSind Sie sicher, dass Sie sie ändern möchten?" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität, führen.\nSind Sie sicher, dass Sie diese ändern möchten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" IDS_STATUS_MEMUSAGE "Speicher: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%"

1 0

02/02: [USER32] Small fixes for messages carrying pointers SendNotifyMessageW: It doesn't support messages with pointers so there is no need to call MsgiUMToKMMessage SendMessageTimeoutW, SendMessageTimeoutA: These two do support marshaling pointers so they need to use MsgiUMToKMMessage. This is actually a bug that happens only in the rare case where we send a WM_COPYDATA with a timeout.
by Giannis Adamopoulos 26 Feb '18

26 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3610035ce4a2581689fe… commit e3610035ce4a2581689fe7752f435b5c58f9de26 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 24 20:26:24 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Feb 26 16:51:59 2018 +0200 [USER32] Small fixes for messages carrying pointers SendNotifyMessageW: It doesn't support messages with pointers so there is no need to call MsgiUMToKMMessage SendMessageTimeoutW, SendMessageTimeoutA: These two do support marshaling pointers so they need to use MsgiUMToKMMessage. This is actually a bug that happens only in the rare case where we send a WM_COPYDATA with a timeout. --- win32ss/user/user32/windows/message.c | 56 ++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index d9b32d2626..57f15d85b3 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -2587,7 +2587,7 @@ SendMessageTimeoutA( UINT uTimeout, PDWORD_PTR lpdwResult) { - MSG AnsiMsg, UcMsg; + MSG AnsiMsg, UcMsg, KMMsg; LRESULT Result; DOSENDMESSAGE dsm; @@ -2618,14 +2618,21 @@ SendMessageTimeoutA( return FALSE; } + if (!MsgiUMToKMMessage(&UcMsg, &KMMsg, FALSE)) + { + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + return FALSE; + } + Result = NtUserMessageCall( hWnd, - UcMsg.message, - UcMsg.wParam, - UcMsg.lParam, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam, (ULONG_PTR)&dsm, FNID_SENDMESSAGEWTOOPTION, TRUE); + MsgiUMToKMCleanup(&UcMsg, &KMMsg); MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result); if (lpdwResult) *lpdwResult = dsm.Result; @@ -2652,6 +2659,7 @@ SendMessageTimeoutW( { LRESULT Result; DOSENDMESSAGE dsm; + MSG UMMsg, KMMsg; if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2667,14 +2675,28 @@ SendMessageTimeoutW( dsm.uTimeout = uTimeout; dsm.Result = 0; + UMMsg.hwnd = hWnd; + UMMsg.message = Msg; + UMMsg.wParam = wParam; + UMMsg.lParam = lParam; + UMMsg.time = 0; + UMMsg.pt.x = 0; + UMMsg.pt.y = 0; + if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) + { + return FALSE; + } + Result = NtUserMessageCall( hWnd, - Msg, - wParam, - lParam, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam, (ULONG_PTR)&dsm, FNID_SENDMESSAGEWTOOPTION, FALSE); + MsgiUMToKMCleanup(&UMMsg, &KMMsg); + if (lpdwResult) *lpdwResult = dsm.Result; SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); @@ -2731,7 +2753,6 @@ SendNotifyMessageW( WPARAM wParam, LPARAM lParam) { - MSG UMMsg, KMMsg; LRESULT Result; if (is_pointer_message(Msg)) @@ -2740,27 +2761,14 @@ SendNotifyMessageW( return FALSE; } - UMMsg.hwnd = hWnd; - UMMsg.message = Msg; - UMMsg.wParam = wParam; - UMMsg.lParam = lParam; - UMMsg.time = 0; - UMMsg.pt.x = 0; - UMMsg.pt.y = 0; - if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) - { - return FALSE; - } Result = NtUserMessageCall( hWnd, - KMMsg.message, - KMMsg.wParam, - KMMsg.lParam, + Msg, + wParam, + lParam, 0, FNID_SENDNOTIFYMESSAGE, FALSE); - MsgiUMToKMCleanup(&UMMsg, &KMMsg); - return Result; }

1 0

01/02: [WINSRV] Implement sending the hard error balloon package to explorer [EXPLORER] Implement showing the hard error balloon
by Giannis Adamopoulos 26 Feb '18

26 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec91188fffe6df11881c2… commit ec91188fffe6df11881c2c72b6a3cf98c18308c8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Feb 22 19:15:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Feb 26 16:51:59 2018 +0200 [WINSRV] Implement sending the hard error balloon package to explorer [EXPLORER] Implement showing the hard error balloon --- base/shell/explorer/syspager.cpp | 1 + base/shell/explorer/taskswnd.cpp | 118 ++++++++++++++++++++++++++++++++ sdk/include/reactos/undocuser.h | 11 +++ win32ss/user/winsrv/usersrv/harderror.c | 83 ++++++++++++++++++++-- 4 files changed, 209 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 7be7eeb694..fa2aa73b36 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1207,6 +1207,7 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) const WCHAR szSysPagerWndClass[] = L"SysPager"; CSysPagerWnd::CSysPagerWnd() {} + CSysPagerWnd::~CSysPagerWnd() {} LRESULT CSysPagerWnd::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 590dc4062d..60b047a7dc 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -99,6 +99,103 @@ typedef struct _TASK_ITEM }; } TASK_ITEM, *PTASK_ITEM; + +class CHardErrorThread +{ + DWORD m_ThreadId; + HANDLE m_hThread; + LONG m_bThreadRunning; + DWORD m_Status; + DWORD m_dwType; + CStringW m_Title; + CStringW m_Text; +public: + + CHardErrorThread(): + m_ThreadId(0), + m_hThread(NULL), + m_bThreadRunning(FALSE), + m_Status(NULL), + m_dwType(NULL) + { + } + + ~CHardErrorThread() + { + if (m_bThreadRunning) + { + /* Try to unstuck Show */ + PostThreadMessage(m_ThreadId, WM_QUIT, 0, 0); + DWORD ret = WaitForSingleObject(m_hThread, 3*1000); + if (ret == WAIT_TIMEOUT) + TerminateThread(m_hThread, 0); + CloseHandle(m_hThread); + } + } + + HRESULT ThreadProc() + { + HRESULT hr; + CComPtr<IUserNotification> pnotification; + + hr = OleInitialize(NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = CoCreateInstance(CLSID_UserNotification, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IUserNotification, &pnotification)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pnotification->SetBalloonInfo(m_Title, m_Text, NIIF_WARNING); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pnotification->SetIconInfo(NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* Show will block until the balloon closes */ + hr = pnotification->Show(NULL, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; + } + + static DWORD CALLBACK s_HardErrorThreadProc(IN OUT LPVOID lpParameter) + { + CHardErrorThread* pThis = reinterpret_cast<CHardErrorThread*>(lpParameter); + pThis->ThreadProc(); + CloseHandle(pThis->m_hThread); + OleUninitialize(); + InterlockedExchange(&pThis->m_bThreadRunning, FALSE); + return 0; + } + + void StartThread(PBALLOON_HARD_ERROR_DATA pData) + { + BOOL bIsRunning = InterlockedExchange(&m_bThreadRunning, TRUE); + + /* Ignore the new message if we are already showing one */ + if (bIsRunning) + return; + + m_Status = pData->Status; + m_dwType = pData->dwType; + m_Title = (PWCHAR)((ULONG_PTR)pData + pData->TitleOffset); + m_Text = (PWCHAR)((ULONG_PTR)pData + pData->MessageOffset); + m_hThread = CreateThread(NULL, 0, s_HardErrorThreadProc, this, 0, &m_ThreadId); + if (!m_hThread) + { + m_bThreadRunning = FALSE; + CloseHandle(m_hThread); + } + } +}; + class CTaskToolbar : public CWindowImplBaseT< CToolbar<TASK_ITEM>, CControlWinTraits > { @@ -222,6 +319,9 @@ class CTaskSwitchWnd : SIZE m_ButtonSize; + UINT m_uHardErrorMsg; + CHardErrorThread m_HardErrorThread; + public: CTaskSwitchWnd() : m_ShellHookMsg(NULL), @@ -238,6 +338,7 @@ public: m_IsDestroying(FALSE) { ZeroMemory(&m_ButtonSize, sizeof(m_ButtonSize)); + m_uHardErrorMsg = RegisterWindowMessageW(L"HardError"); } virtual ~CTaskSwitchWnd() { } @@ -1821,6 +1922,22 @@ public: return 0; } + LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; + if (cpData->dwData == m_uHardErrorMsg) + { + /* A hard error balloon message */ + PBALLOON_HARD_ERROR_DATA pData = (PBALLOON_HARD_ERROR_DATA)cpData->lpData; + ERR("Got balloon data 0x%x, 0x%x, %S, %S!\n", pData->Status, pData->dwType, (WCHAR*)((ULONG_PTR)pData + pData->TitleOffset), (WCHAR*)((ULONG_PTR)pData + pData->MessageOffset)); + if (pData->cbHeaderSize == sizeof(BALLOON_HARD_ERROR_DATA)) + m_HardErrorThread.StartThread(pData); + return TRUE; + } + + return FALSE; + } + HRESULT Initialize(IN HWND hWndParent, IN OUT ITrayWindow *tray) { m_Tray = tray; @@ -1864,6 +1981,7 @@ public: MESSAGE_HANDLER(m_ShellHookMsg, OnShellHook) MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect) + MESSAGE_HANDLER(WM_COPYDATA, OnCopyData) END_MSG_MAP() DECLARE_NOT_AGGREGATABLE(CTaskSwitchWnd) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index dea855684c..dbe93b2ac9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -204,6 +204,17 @@ BOOL WINAPI PaintMenuBar(HWND hWnd, HDC hDC, ULONG left, ULONG right, ULONG top, #define DrawCaptionTemp DrawCaptionTempA #endif +// +// Hard error balloon package +// +typedef struct _BALLOON_HARD_ERROR_DATA +{ + DWORD cbHeaderSize; + DWORD Status; + DWORD dwType; /* any combination of the MB_ message box types */ + ULONG_PTR TitleOffset; + ULONG_PTR MessageOffset; +} BALLOON_HARD_ERROR_DATA, *PBALLOON_HARD_ERROR_DATA; // // User api hook diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 52e22a89d4..54d4b52764 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -439,6 +439,69 @@ UserpFormatMessages( return Status; } +static BOOL +UserpShowInformationBalloon(PWSTR Text, + PWSTR Caption, + PHARDERROR_MSG Message) +{ + HWND hwnd; + COPYDATASTRUCT CopyData; + PBALLOON_HARD_ERROR_DATA pdata; + DWORD dwSize, cchText, cchCaption; + PWCHAR pText, pCaption; + DWORD ret, dwResult; + + hwnd = GetTaskmanWindow(); + if (!hwnd) + { + DPRINT1("Failed to find Shell_TrayWnd\n"); + return FALSE; + } + + cchText = wcslen(Text); + cchCaption = wcslen(Caption); + + dwSize = sizeof(BALLOON_HARD_ERROR_DATA); + dwSize += (cchText + 1) * sizeof(WCHAR); + dwSize += (cchCaption + 1) * sizeof(WCHAR); + + pdata = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); + if (!pdata) + { + DPRINT1("Failed to allocate balloon package\n"); + return FALSE; + } + + pdata->cbHeaderSize = sizeof(BALLOON_HARD_ERROR_DATA); + pdata->Status = Message->Status; + if (NT_SUCCESS(Message->Status)) + pdata->dwType = MB_OK; + else if (Message->Status == STATUS_SERVICE_NOTIFICATION) + pdata->dwType = Message->Parameters[2]; + else + pdata->dwType = MB_ICONINFORMATION; + pdata->TitleOffset = pdata->cbHeaderSize; + pdata->MessageOffset = pdata->TitleOffset; + pdata->MessageOffset += (cchCaption + 1) * sizeof(WCHAR); + pCaption = (PWCHAR)((ULONG_PTR)pdata + pdata->TitleOffset); + pText = (PWCHAR)((ULONG_PTR)pdata + pdata->MessageOffset); + wcscpy(pCaption, Caption); + wcscpy(pText, Text); + + CopyData.dwData = RegisterWindowMessageW(L"HardError"); + CopyData.cbData = dwSize; + CopyData.lpData = pdata; + + dwResult = FALSE; + + ret = SendMessageTimeoutW(hwnd, WM_COPYDATA, 0, (LPARAM)&CopyData, + SMTO_NORMAL | SMTO_ABORTIFHUNG, 3000, &dwResult); + + RtlFreeHeap(RtlGetProcessHeap(), 0, pdata); + + return (ret && dwResult) ? TRUE : FALSE; +} + static ULONG UserpMessageBox( @@ -475,10 +538,9 @@ UserpMessageBox( break; case OptionOkNoWait: /* - * This gives a balloon notification. - * See rostests/kmtests/ntos_ex/ExHardError.c + * At that point showing the balloon failed. Is that correct? */ - Type = MB_YESNO; // FIXME! + Type = MB_OK; // FIXME! break; case OptionCancelTryContinue: Type = MB_CANCELTRYCONTINUE; @@ -583,6 +645,20 @@ UserServerHardError( return; } + if (Message->ValidResponseOptions == OptionOkNoWait) + { + /* Display the balloon */ + if (UserpShowInformationBalloon(TextU.Buffer, + CaptionU.Buffer, + Message)) + { + Message->Response = ResponseOk; + RtlFreeUnicodeString(&TextU); + RtlFreeUnicodeString(&CaptionU); + return; + } + } + /* Display the message box */ Message->Response = UserpMessageBox(TextU.Buffer, CaptionU.Buffer, @@ -591,7 +667,6 @@ UserServerHardError( RtlFreeUnicodeString(&TextU); RtlFreeUnicodeString(&CaptionU); - return; }

1 0

01/01: [SNDVOL32] Add the tray volume dialog - Add the tray volume dialog (run "sndvol32 /t"). - Add a simple command line parser.
by Eric Kohl 26 Feb '18

26 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40bd09a2ce78328f70904… commit 40bd09a2ce78328f709047c420f46e0925978d8b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 25 21:58:34 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 26 00:44:41 2018 +0100 [SNDVOL32] Add the tray volume dialog - Add the tray volume dialog (run "sndvol32 /t"). - Add a simple command line parser. --- base/applications/sndvol32/CMakeLists.txt | 1 + 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 | 1 + base/applications/sndvol32/sndvol32.c | 112 ++++++++++++++++++++++++------ base/applications/sndvol32/sndvol32.h | 10 +++ base/applications/sndvol32/tray.c | 71 +++++++++++++++++++ 33 files changed, 453 insertions(+), 22 deletions(-) diff --git a/base/applications/sndvol32/CMakeLists.txt b/base/applications/sndvol32/CMakeLists.txt index 3d97d129de..dd1827368a 100644 --- a/base/applications/sndvol32/CMakeLists.txt +++ b/base/applications/sndvol32/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE misc.c mixer.c sndvol32.c + tray.c sndvol32.h) add_rc_deps(sndvol32.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/sndvol32.ico) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 4bd1fabfc9..6ac13cd18e 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -58,3 +58,13 @@ BEGIN CHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 190, 110, 16, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Сила", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index be0dd0c510..1ac95bcda7 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -60,3 +60,13 @@ BEGIN CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Hlasitost", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 7d36e8d688..4df44041f7 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Lautstärke", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 7265a3ff6c..4c8e33ca03 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index e7774a9a37..3a5e80fac6 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 8ba4fc4efc..ef7a74eeaf 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -57,3 +57,13 @@ BEGIN CHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volumen", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 977f1668bd..7331e0ed92 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 02bd4c6e6a..3779376bc7 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "השתק", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "עוצמה", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 373c1d59bf..759ce74b3a 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 3612ab0ab4..cc6327bcfc 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 6794625ffd..3678b5bf0a 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index c57639b20d..61a7b69e1a 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "MS UI Gothic" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 99c5c40b33..1abeb34f03 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "굴림" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index e241dc516c..7c44bf2eae 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index e89e20ec76..18e0bb2889 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 8634227c19..ef4bde48b9 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 05cfbbe303..40610bbfe7 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Głośność", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 54582e241e..146ffb6721 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index ebd21954ef..17cf0379e3 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -55,3 +55,13 @@ BEGIN CHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volum", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 7ed361747c..b9df68910a 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Громкость", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 8e062cf7bf..b58b95ddad 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index ee3089fc02..ac94cdb36d 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -58,3 +58,13 @@ BEGIN CHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volumi", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index f0159ef455..1695b69b1f 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volyme", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 90f19d40f3..b8ab88c434 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 300c24ca77..ae98afc4cb 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Ses Düzeyi", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index f5001c526b..19270442c7 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Гучність", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index 6726c3d01e..d4cea71d42 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "宋体" +BEGIN + CTEXT "音量", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index 2a75b3464b..d70bbd0a3e 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "新細明體" +BEGIN + CTEXT "音量", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 85dfed93dd..80f82e7b1f 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -28,3 +28,4 @@ #define IDD_VOLUME_CTRL 200 #define IDD_PREFERENCES 201 +#define IDD_TRAY_CTRL 202 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index b19f99e0f3..7531518d64 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1136,6 +1136,61 @@ CreateApplicationWindow(VOID) return hWnd; } +static +BOOL +HandleCommandLine(LPTSTR cmdline, + PBOOL pTray) +{ + TCHAR option; + + while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) + { + if (*cmdline++ == _T(' ')) + continue; + + option = *cmdline; + if (option) + cmdline++; + while (*cmdline == _T(' ')) + cmdline++; + + switch (option) + { + case 'd': /* Device */ + case 'D': + break; + + case 'n': /* Normal size */ + case 'N': + *pTray = FALSE; + break; + + case 's': /* Small size */ + case 'S': + *pTray = FALSE; + break; + + case 't': /* Tray size */ + case 'T': + *pTray = TRUE; + break; + + case 'p': /* Play mode */ + case 'P': + break; + + case 'r': /* Record mode */ + case 'R': + break; + + default: + return FALSE; + } + } + + return TRUE; +} + int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -1145,14 +1200,16 @@ _tWinMain(HINSTANCE hInstance, MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX Controls; + BOOL bTray = FALSE; UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpszCmdLine); - UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(nCmdShow); hAppInstance = hInstance; hAppHeap = GetProcessHeap(); + HandleCommandLine(lpszCmdLine, &bTray); + if (InitAppConfig()) { /* load the application title */ @@ -1168,37 +1225,48 @@ _tWinMain(HINSTANCE hInstance, InitCommonControlsEx(&Controls); - if (RegisterApplicationClasses()) + if (bTray) + { + DialogBoxParam(hAppInstance, + MAKEINTRESOURCE(IDD_TRAY_CTRL), + NULL, + TrayDlgProc, + 0); + } + else { - hMainWnd = CreateApplicationWindow(); - if (hMainWnd != NULL) + if (RegisterApplicationClasses()) { - BOOL bRet; - while ((bRet =GetMessage(&Msg, - NULL, - 0, - 0)) != 0) + hMainWnd = CreateApplicationWindow(); + if (hMainWnd != NULL) { - if (bRet != -1) + BOOL bRet; + while ((bRet =GetMessage(&Msg, + NULL, + 0, + 0)) != 0) { - TranslateMessage(&Msg); - DispatchMessage(&Msg); + if (bRet != -1) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } } + + DestroyWindow(hMainWnd); + Ret = 0; + } + else + { + DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError()); } - DestroyWindow(hMainWnd); - Ret = 0; + UnregisterApplicationClasses(); } else { - DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError()); + DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError()); } - - UnregisterApplicationClasses(); - } - else - { - DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError()); } if (lpAppTitle != NULL) diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index cd9c7ad5b3..f98f23d493 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -164,4 +164,14 @@ WriteLineConfig(IN LPTSTR szDeviceName, IN PSNDVOL_REG_LINESTATE LineState, IN DWORD cbSize); +/* tray.c */ + +INT_PTR +CALLBACK +TrayDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + #endif /* __SNDVOL32_H */ diff --git a/base/applications/sndvol32/tray.c b/base/applications/sndvol32/tray.c new file mode 100644 index 0000000000..2223aadaef --- /dev/null +++ b/base/applications/sndvol32/tray.c @@ -0,0 +1,71 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Sound Volume Control + * FILE: base/applications/sndvol32/tray.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "sndvol32.h" + +static VOID +OnTrayInitDialog( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + POINT ptCursor; + RECT rcWindow; + RECT rcScreen; + LONG x, y, cx, cy; + + GetCursorPos(&ptCursor); + + GetWindowRect(hwnd, &rcWindow); + + GetWindowRect(GetDesktopWindow(), &rcScreen); + + cx = rcWindow.right - rcWindow.left; + cy = rcWindow.bottom - rcWindow.top; + + if (ptCursor.y + cy > rcScreen.bottom) + y = ptCursor.y - cy; + else + y = ptCursor.y; + + if (ptCursor.x + cx > rcScreen.right) + x = ptCursor.x - cx; + else + x = ptCursor.x; + + SetWindowPos(hwnd, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE); + + /* Disable the controls for now */ + EnableWindow(GetDlgItem(hwnd, IDC_LINE_SLIDER_VERT), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_LINE_SWITCH), FALSE); +} + + +INT_PTR +CALLBACK +TrayDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnTrayInitDialog(hwndDlg, wParam, lParam); + break; + + case WM_ACTIVATE: + if (LOWORD(wParam) == WA_INACTIVE) + EndDialog(hwndDlg, IDOK); + break; + } + + return 0; +} + +/* EOF */

1 0

05/05: [ADVAPI32] Few improvements for Services.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=295ea36f9e8e70fd219ed… commit 295ea36f9e8e70fd219ed9eaf8dc25e536db82a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 23:35:35 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:09 2018 +0100 [ADVAPI32] Few improvements for Services. - Set some last errors. - Fix error code returned by ScLookupServiceByServiceName(). - Check the validity of the handler proc in RegisterServiceCtrlHandler(Ex)W(). - Improve some traces; comment some code. --- dll/win32/advapi32/service/sctrl.c | 135 +++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 51 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 30903ffeb4..f0de114f40 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -135,15 +135,19 @@ ScDestroyStatusBinding(VOID) } -static PACTIVE_SERVICE -ScLookupServiceByServiceName(LPCWSTR lpServiceName) +static DWORD +ScLookupServiceByServiceName(IN LPCWSTR lpServiceName, + OUT PACTIVE_SERVICE* pService) { DWORD i; TRACE("ScLookupServiceByServiceName(%S) called\n", lpServiceName); if (lpActiveServices[0].bOwnProcess) - return &lpActiveServices[0]; + { + *pService = &lpActiveServices[0]; + return ERROR_SUCCESS; + } for (i = 0; i < dwActiveServiceCount; i++) { @@ -151,15 +155,14 @@ ScLookupServiceByServiceName(LPCWSTR lpServiceName) if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) { TRACE("Found!\n"); - return &lpActiveServices[i]; + *pService = &lpActiveServices[i]; + return ERROR_SUCCESS; } } TRACE("No service found!\n"); - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; + *pService = NULL; + return ERROR_SERVICE_NOT_IN_EXE; } @@ -268,7 +271,7 @@ ScConnectControlPipe(HANDLE *hPipe) dwProcessId = GetCurrentProcessId(); WriteFile(*hPipe, &dwProcessId, - sizeof(DWORD), + sizeof(dwProcessId), &dwBytesWritten, NULL); @@ -588,8 +591,8 @@ ScServiceDispatcher(HANDLE hPipe, if (ControlPacket->dwControl == SERVICE_CONTROL_START_OWN) lpActiveServices[0].bOwnProcess = TRUE; - lpService = ScLookupServiceByServiceName(lpServiceName); - if (lpService != NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &lpService); + if ((dwError == ERROR_SUCCESS) && (lpService != NULL)) { /* Execute command */ switch (ControlPacket->dwControl) @@ -611,10 +614,6 @@ ScServiceDispatcher(HANDLE hPipe, break; } } - else - { - dwError = ERROR_SERVICE_DOES_NOT_EXIST; - } } ReplyPacket.dwError = dwError; @@ -647,21 +646,21 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, { ANSI_STRING ServiceNameA; UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; + SERVICE_STATUS_HANDLE hServiceStatus; - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + RtlInitAnsiString(&ServiceNameA, lpServiceName); if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; } - SHandle = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, - lpHandlerProc); + hServiceStatus = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, + lpHandlerProc); RtlFreeUnicodeString(&ServiceNameU); - return SHandle; + return hServiceStatus; } @@ -674,18 +673,26 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, LPHANDLER_FUNCTION lpHandlerProc) { + DWORD dwError; PACTIVE_SERVICE Service; - Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); - if (Service == NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &Service); + if ((dwError != ERROR_SUCCESS) || (Service == NULL)) + { + SetLastError(dwError); + return NULL; + } + + if (!lpHandlerProc) { - return (SERVICE_STATUS_HANDLE)NULL; + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } - Service->HandlerFunction = lpHandlerProc; + Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - TRACE("RegisterServiceCtrlHandler returning %lu\n", Service->hServiceStatus); + TRACE("RegisterServiceCtrlHandler returning 0x%p\n", Service->hServiceStatus); return Service->hServiceStatus; } @@ -703,22 +710,22 @@ RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, { ANSI_STRING ServiceNameA; UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; + SERVICE_STATUS_HANDLE hServiceStatus; - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + RtlInitAnsiString(&ServiceNameA, lpServiceName); if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; } - SHandle = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, - lpHandlerProc, - lpContext); + hServiceStatus = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, + lpHandlerProc, + lpContext); RtlFreeUnicodeString(&ServiceNameU); - return SHandle; + return hServiceStatus; } @@ -732,19 +739,27 @@ RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext) { + DWORD dwError; PACTIVE_SERVICE Service; - Service = ScLookupServiceByServiceName(lpServiceName); - if (Service == NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &Service); + if ((dwError != ERROR_SUCCESS) || (Service == NULL)) { - return (SERVICE_STATUS_HANDLE)NULL; + SetLastError(dwError); + return NULL; } - Service->HandlerFunction = NULL; + if (!lpHandlerProc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + Service->HandlerFunction = NULL; Service->HandlerFunctionEx = lpHandlerProc; - Service->HandlerContext = lpContext; + Service->HandlerContext = lpContext; - TRACE("RegisterServiceCtrlHandlerEx returning %lu\n", Service->hServiceStatus); + TRACE("RegisterServiceCtrlHandlerEx returning 0x%p\n", Service->hServiceStatus); return Service->hServiceStatus; } @@ -942,11 +957,14 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) } dwActiveServiceCount = i; + + /* Initialize the service table */ lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); if (lpActiveServices == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -956,16 +974,18 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].ServiceMain.A = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = 0; + lpActiveServices[i].hServiceStatus = NULL; lpActiveServices[i].bUnicode = FALSE; lpActiveServices[i].bOwnProcess = FALSE; } + /* Initialize the connection to the SCM */ + dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { bRet = FALSE; - goto done; + goto Done; } dwBufSize = sizeof(SCM_CONTROL_PACKET) + @@ -976,22 +996,24 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) dwBufSize); if (ControlPacket == NULL) { + dwError = ERROR_NOT_ENOUGH_MEMORY; bRet = FALSE; - goto done; + goto Done; } ScCreateStatusBinding(); + /* Start the dispatcher loop */ ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); + /* Close the connection */ ScDestroyStatusBinding(); - CloseHandle(hPipe); /* Free the control packet */ RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); -done: +Done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -1001,6 +1023,8 @@ done: lpActiveServices = NULL; dwActiveServiceCount = 0; + if (!bRet) SetLastError(dwError); + return bRet; } @@ -1029,11 +1053,14 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) } dwActiveServiceCount = i; + + /* Initialize the service table */ lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); if (lpActiveServices == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -1043,16 +1070,18 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].ServiceMain.W = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = 0; + lpActiveServices[i].hServiceStatus = NULL; lpActiveServices[i].bUnicode = TRUE; lpActiveServices[i].bOwnProcess = FALSE; } + /* Initialize the connection to the SCM */ + dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { bRet = FALSE; - goto done; + goto Done; } dwBufSize = sizeof(SCM_CONTROL_PACKET) + @@ -1063,22 +1092,24 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) dwBufSize); if (ControlPacket == NULL) { + dwError = ERROR_NOT_ENOUGH_MEMORY; bRet = FALSE; - goto done; + goto Done; } ScCreateStatusBinding(); + /* Start the dispatcher loop */ ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); + /* Close the connection */ ScDestroyStatusBinding(); - CloseHandle(hPipe); /* Free the control packet */ RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); -done: +Done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -1088,6 +1119,8 @@ done: lpActiveServices = NULL; dwActiveServiceCount = 0; + if (!bRet) SetLastError(dwError); + return bRet; }

1 0

04/05: [ADVAPI32] Code formatting + improve two traces.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e3f80f940f494c06a19f… commit 2e3f80f940f494c06a19f143f427a87933207224 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 19:40:08 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:05 2018 +0100 [ADVAPI32] Code formatting + improve two traces. --- dll/win32/advapi32/service/sctrl.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index b5e1b8a26b..30903ffeb4 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -229,7 +229,6 @@ ScConnectControlPipe(HANDLE *hPipe) QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) { ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); @@ -638,7 +637,7 @@ ScServiceDispatcher(HANDLE hPipe, /********************************************************************** - * RegisterServiceCtrlHandlerA + * RegisterServiceCtrlHandlerA * * @implemented */ @@ -667,7 +666,7 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerW + * RegisterServiceCtrlHandlerW * * @implemented */ @@ -693,7 +692,7 @@ RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerExA + * RegisterServiceCtrlHandlerExA * * @implemented */ @@ -724,7 +723,7 @@ RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerExW + * RegisterServiceCtrlHandlerExW * * @implemented */ @@ -752,7 +751,7 @@ RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, /********************************************************************** - * I_ScIsSecurityProcess + * I_ScIsSecurityProcess * * Undocumented * @@ -766,7 +765,7 @@ I_ScIsSecurityProcess(VOID) /********************************************************************** - * I_ScPnPGetServiceName + * I_ScPnPGetServiceName * * Undocumented * @@ -794,7 +793,7 @@ I_ScPnPGetServiceName(IN SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * I_ScSetServiceBitsA + * I_ScSetServiceBitsA * * Undocumented * @@ -811,7 +810,6 @@ I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus, RpcTryExcept { - /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsA((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, @@ -830,7 +828,7 @@ I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * I_ScSetServiceBitsW + * I_ScSetServiceBitsW * * Undocumented * @@ -847,7 +845,6 @@ I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus, RpcTryExcept { - /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsW((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, @@ -866,7 +863,7 @@ I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * SetServiceBits + * SetServiceBits * * @implemented */ @@ -885,7 +882,7 @@ SetServiceBits(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * SetServiceStatus + * SetServiceStatus * * @implemented */ @@ -895,12 +892,10 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, { DWORD dwError; - TRACE("SetServiceStatus() called\n"); - TRACE("hServiceStatus %lu\n", hServiceStatus); + TRACE("SetServiceStatus(hServiceStatus %lu) called\n", hServiceStatus); RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RSetServiceStatus((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, lpServiceStatus); } @@ -912,7 +907,7 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, if (dwError != ERROR_SUCCESS) { - ERR("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + ERR("RSetServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -924,7 +919,7 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * StartServiceCtrlDispatcherA + * StartServiceCtrlDispatcherA * * @implemented */ @@ -1011,7 +1006,7 @@ done: /********************************************************************** - * StartServiceCtrlDispatcherW + * StartServiceCtrlDispatcherW * * @implemented */

1 0

03/05: [ADVAPI32] ScStartService(): Just start the thread straight ahead, and return a suitable error code if thread creation failed.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c44925ec1a31e6c0dc66… commit 0c44925ec1a31e6c0dc66ea8f68a2755d1e4f492 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 19:02:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:01 2018 +0100 [ADVAPI32] ScStartService(): Just start the thread straight ahead, and return a suitable error code if thread creation failed. --- dll/win32/advapi32/service/sctrl.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 5afa8dfc14..b5e1b8a26b 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -432,9 +432,9 @@ ScStartService(PACTIVE_SERVICE lpService, if (lpService == NULL || ControlPacket == NULL) return ERROR_INVALID_PARAMETER; - TRACE("ScStartService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + TRACE("ScStartService(Size: %lu, Service: '%S') called\n", + ControlPacket->dwSize, + (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); /* Set the service status handle */ lpService->hServiceStatus = ControlPacket->hServiceStatus; @@ -458,18 +458,20 @@ ScStartService(PACTIVE_SERVICE lpService, 0, ScServiceMainStubW, ThreadParamsW, - CREATE_SUSPENDED, + 0, &ThreadId); if (ThreadHandle == NULL) { if (ThreadParamsW->lpArgVector != NULL) { - HeapFree(GetProcessHeap(), - 0, - ThreadParamsW->lpArgVector); + HeapFree(GetProcessHeap(), 0, ThreadParamsW->lpArgVector); } HeapFree(GetProcessHeap(), 0, ThreadParamsW); + + return ERROR_SERVICE_NO_THREAD; } + + CloseHandle(ThreadHandle); } else { @@ -489,22 +491,21 @@ ScStartService(PACTIVE_SERVICE lpService, 0, ScServiceMainStubA, ThreadParamsA, - CREATE_SUSPENDED, + 0, &ThreadId); if (ThreadHandle == NULL) { if (ThreadParamsA->lpArgVector != NULL) { - HeapFree(GetProcessHeap(), - 0, - ThreadParamsA->lpArgVector); + HeapFree(GetProcessHeap(), 0, ThreadParamsA->lpArgVector); } HeapFree(GetProcessHeap(), 0, ThreadParamsA); + + return ERROR_SERVICE_NO_THREAD; } - } - ResumeThread(ThreadHandle); - CloseHandle(ThreadHandle); + CloseHandle(ThreadHandle); + } return ERROR_SUCCESS; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs