Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [DESK] Fix text truncation in fr-FR.rc

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40e58323693d58ec1f683… commit 40e58323693d58ec1f6838f81bf692fee372fc75 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 28 23:00:31 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 28 23:00:31 2018 +0100 [DESK] Fix text truncation in fr-FR.rc CORE-13514 --- dll/cpl/desk/lang/fr-FR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 73dd775e32..05401a075d 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -28,15 +28,15 @@ BEGIN PUSHBUTTON "Paramè&tres", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&Aperçu", IDC_SCREENS_TESTSC, 175, 103, 50, 13 LTEXT "Dé&lai ", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + EDITTEXT IDC_SCREENS_TIMEDELAY, 31, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 + LTEXT "minutes", IDC_MINTEXT, 65, 125, 26, 9 CONTROL "À la reprise, demander un mot de &passe", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 93, 120, 140, 19 GROUPBOX "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 LTEXT "Pour modifier les paramètres de l'alimentation du moniteur, cliquez sur Gestion de l'alimentation.", IDC_STATIC, 16, 161, 146, 27 - PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 167, 166, 61, 13 + PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 135, 173, 100, 13 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 202

6 years, 6 months

01/01: [MMSYS] fix text truncation in fr-FR.rc

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e9f053eecaf778c597f4… commit 9e9f053eecaf778c597f4a335c1e0cb4ca348d70 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 28 21:19:42 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 28 21:19:42 2018 +0100 [MMSYS] fix text truncation in fr-FR.rc CORE-13508 --- dll/cpl/mmsys/lang/fr-FR.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 681cd326b0..ad6a397c97 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -13,12 +13,12 @@ BEGIN LTEXT "Faible", -1, 62, 66, 30, 17 LTEXT "Élevé", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 175, 10 PUSHBUTTON "A&vancé...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Paramètres des enceintes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Utilisez les paramètres ci-dessous pour changer le volume de chaque enceinte et modifier d'autres réglagles.", -1, 70, 155, 150, 36 - PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 + PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15 PUSHBUTTON "A&vancé...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 END

6 years, 6 months

01/01: [NTOKSRNL] Don't blindly schedule read-ahead on CcCopyRead() call.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4f58bbfd85f9c713e967… commit c4f58bbfd85f9c713e9673114d15c61b6569e3a5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 28 20:54:53 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 28 20:58:36 2018 +0100 [NTOKSRNL] Don't blindly schedule read-ahead on CcCopyRead() call. This avoids locking Cc for too long by trying to read-ahead data which is already in cache. We now will only schedule a read ahead if next read should bring us to a new VACB (perhaps not in cache). This notably fixes Inkscape setup which was slown down by read-ahead due to continous 1 byte reads. Thanks to Thomas for his help on this issue. CORE-14395 --- ntoskrnl/cc/copy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 8525d9f549..c39b2148ec 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -377,8 +377,11 @@ CcCopyData ( /* If that was a successful sync read operation, let's handle read ahead */ if (Operation == CcOperationRead && Length == 0 && Wait) { - /* If file isn't random access, schedule next read */ - if (!BooleanFlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) + /* If file isn't random access and next read may get us cross VACB boundary, + * schedule next read + */ + if (!BooleanFlagOn(FileObject->Flags, FO_RANDOM_ACCESS) && + (CurrentOffset - 1) / VACB_MAPPING_GRANULARITY != (CurrentOffset + BytesCopied - 1) / VACB_MAPPING_GRANULARITY) { CcScheduleReadAhead(FileObject, (PLARGE_INTEGER)&FileOffset, BytesCopied); }

6 years, 6 months

01/01: [STOBJECT] Use timers to distinguish between single and double clicks - Volume, Power and Hotplug icon: Use timers to distinguish between single and double clicks. - Volume icon: Show the tray volume dialog on a single click.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2baafa61c6cd9908dca8d… commit 2baafa61c6cd9908dca8dfa3c12c94f78cafd056 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Feb 28 20:29:29 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Feb 28 20:29:29 2018 +0100 [STOBJECT] Use timers to distinguish between single and double clicks - Volume, Power and Hotplug icon: Use timers to distinguish between single and double clicks. - Volume icon: Show the tray volume dialog on a single click. --- dll/shellext/stobject/csystray.cpp | 6 +++++- dll/shellext/stobject/hotplug.cpp | 11 ++++++++++- dll/shellext/stobject/power.cpp | 11 ++++++++++- dll/shellext/stobject/volume.cpp | 20 ++++++++++++++------ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index d1e51c116e..d73e67e55d 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -241,8 +241,12 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return TRUE; case WM_TIMER: - UpdateIcons(); + if (wParam == 1) + UpdateIcons(); + else + ProcessIconMessage(uMsg, wParam, lParam, lResult); return TRUE; + case WM_DESTROY: KillTimer(1); ShutdownIcons(); diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 9af5eef972..ed0660f49e 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -280,19 +280,28 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, W } return S_FALSE; + case WM_TIMER: + if (wParam == HOTPLUG_TIMER_ID) + { + KillTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID); + _ShowContextMenu(pSysTray); + } + break; + case ID_ICON_HOTPLUG: Hotplug_Update(pSysTray); switch (lParam) { case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: - _ShowContextMenu(pSysTray); break; case WM_LBUTTONDBLCLK: + KillTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID); _RunHotplug(pSysTray); break; diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 12382faf7d..ada4fb1e81 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -374,19 +374,28 @@ HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPA } return S_FALSE; + case WM_TIMER: + if (wParam == POWER_TIMER_ID) + { + KillTimer(pSysTray->GetHWnd(), POWER_TIMER_ID); + ShowPowerSchemesPopupMenu(pSysTray); + } + break; + case ID_ICON_POWER: Power_Update(pSysTray); switch (lParam) { case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), POWER_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: - ShowPowerSchemesPopupMenu(pSysTray); break; case WM_LBUTTONDBLCLK: + KillTimer(pSysTray->GetHWnd(), POWER_TIMER_ID); _RunPower(); break; diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index a78bda743b..ba0f905356 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -214,10 +214,9 @@ HRESULT Volume_OnDeviceChange(_In_ CSysTray * pSysTray, WPARAM wParam, LPARAM lP return Volume_FindMixerControl(pSysTray); } -static void _RunVolume() +static void _RunVolume(BOOL bTray) { - // FIXME: ensure we are loading the right one - ShellExecuteW(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(NULL, NULL, bTray ? L"sndvol32.exe /t" : L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); } static void _RunMMCpl() @@ -250,7 +249,7 @@ static void _ShowContextMenu(CSysTray * pSysTray) switch (id) { case IDS_VOL_OPEN: - _RunVolume(); + _RunVolume(FALSE); break; case IDS_VOL_ADJUST: _RunMMCpl(); @@ -285,6 +284,14 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP } return S_FALSE; + case WM_TIMER: + if (wParam == VOLUME_TIMER_ID) + { + KillTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID); + _RunVolume(TRUE); + } + break; + case ID_ICON_VOLUME: TRACE("Volume_Message uMsg=%d, w=%x, l=%x\n", uMsg, wParam, lParam); @@ -293,14 +300,15 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP switch (lParam) { case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: - TRACE("TODO: display volume slider\n"); break; case WM_LBUTTONDBLCLK: - _RunVolume(); + KillTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID); + _RunVolume(FALSE); break; case WM_RBUTTONDOWN:

6 years, 6 months

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

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

6 years, 6 months

02/03: [BROWSEUI] CBandSite: Implement SetBandSiteInfo and GetBandSiteInfo Only BSIS_LOCKED, BSIS_NOGRIPPER, BSIS_ALWAYSGRIPPER and BSIS_NOCAPTION supported so far.

by Giannis Adamopoulos

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

6 years, 6 months

01/03: [BROWSEUI] CBandSite: Style fixes

by Giannis Adamopoulos

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)

6 years, 6 months

01/01: [TRANSLATION] Completed German translation in taskmgr

by Simon Dräger

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%%"

6 years, 6 months

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

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

6 years, 6 months

01/02: [WINSRV] Implement sending the hard error balloon package to explorer [EXPLORER] Implement showing the hard error balloon

by Giannis Adamopoulos

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

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018