Ros-diffs June 2023

ros-diffs@reactos.org

20 participants
155 discussions

[reactos] 01/01: [MSPAINT] s/HasUndoSteps/CanUndo/ and s/HasRedoSteps/CanRedo/
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa4c3bd560802d4e7d455… commit fa4c3bd560802d4e7d4553c4625dbaf404086aed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 18:24:42 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 18:24:42 2023 +0900 [MSPAINT] s/HasUndoSteps/CanUndo/ and s/HasRedoSteps/CanRedo/ CORE-18867 --- base/applications/mspaint/history.cpp | 4 ++-- base/applications/mspaint/history.h | 4 ++-- base/applications/mspaint/winproc.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 5be421fdfa0..4220bae84bd 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -176,12 +176,12 @@ BOOL ImageModel::IsImageSaved() const return imageSaved; } -BOOL ImageModel::HasUndoSteps() const +BOOL ImageModel::CanUndo() const { return undoSteps > 0; } -BOOL ImageModel::HasRedoSteps() const +BOOL ImageModel::CanRedo() const { return redoSteps > 0; } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 40792f8d661..d7a65f9e892 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -34,8 +34,8 @@ public: void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); void SaveImage(LPTSTR lpFileName); BOOL IsImageSaved() const; - BOOL HasUndoSteps() const; - BOOL HasRedoSteps() const; + BOOL CanUndo() const; + BOOL CanRedo() const; void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); int GetWidth() const; int GetHeight() const; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 087c50fd76e..c1deaa155bc 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -431,8 +431,8 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO ProcessFileMenu((HMENU)wParam); break; case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.HasUndoSteps())); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.HasRedoSteps())); + EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.CanUndo())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.CanRedo())); EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection));

1 0

[reactos] 01/01: [MSPAINT] Move selection by arrow keys (#5334)
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a886073876781c410fb2… commit 1a886073876781c410fb2e815a3528a1430b852b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 16:31:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 16:31:18 2023 +0900 [MSPAINT] Move selection by arrow keys (#5334) Improve keyboard usability. - Add CCanvasWindow::MoveSelection. - Modify CMainWindow::OnKeyDown. - If Esc key is pressed, then the selection will land to canvas. - If any arrow key is pressed, then the selection will move a bit. CORE-18867 --- base/applications/mspaint/canvas.cpp | 10 +++++++++ base/applications/mspaint/canvas.h | 1 + base/applications/mspaint/winproc.cpp | 38 +++++++++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index a6aa9b461f9..b83a692ab7c 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -777,6 +777,16 @@ VOID CCanvasWindow::EndSelectionDrag(POINT ptImage) Invalidate(FALSE); } +VOID CCanvasWindow::MoveSelection(INT xDelta, INT yDelta) +{ + if (!selectionModel.m_bShow) + return; + + selectionModel.TakeOff(); + ::OffsetRect(&selectionModel.m_rc, xDelta, yDelta); + Invalidate(FALSE); +} + LRESULT CCanvasWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SetTextColor((HDC)wParam, paletteModel.GetFgColor()); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index a201bdc2c7a..53d5fa1acc1 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -48,6 +48,7 @@ public: VOID CanvasToImage(POINT& pt, BOOL bZoomed = FALSE); VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); + VOID MoveSelection(INT xDelta, INT yDelta); protected: CANVAS_HITTEST m_hitSelection; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 857eedd81ae..087c50fd76e 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -493,17 +493,39 @@ LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (wParam == VK_ESCAPE) + HWND hwndCapture; + switch (wParam) { - HWND hwndCapture = GetCapture(); - if (hwndCapture) - { - if (canvasWindow.m_hWnd == hwndCapture || - fullscreenWindow.m_hWnd == hwndCapture) + case VK_ESCAPE: + hwndCapture = GetCapture(); + if (hwndCapture) + { + if (canvasWindow.m_hWnd == hwndCapture || + fullscreenWindow.m_hWnd == hwndCapture) + { + SendMessage(hwndCapture, nMsg, wParam, lParam); + } + } + else if (selectionModel.m_bShow) { - SendMessage(hwndCapture, nMsg, wParam, lParam); + selectionModel.Landing(); + selectionModel.m_bShow = FALSE; + canvasWindow.Invalidate(FALSE); } - } + break; + + case VK_LEFT: + canvasWindow.MoveSelection(-1, 0); + break; + case VK_RIGHT: + canvasWindow.MoveSelection(+1, 0); + break; + case VK_UP: + canvasWindow.MoveSelection(0, -1); + break; + case VK_DOWN: + canvasWindow.MoveSelection(0, +1); + break; } return 0; }

1 0

[reactos] 01/01: [MSPAINT] Set CC_RGBINIT to CMainWindow::ChooseColor
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0087ea65977dbefab1755… commit 0087ea65977dbefab17551799c740537a6588c31 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 15:47:41 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 15:51:52 2023 +0900 [MSPAINT] Set CC_RGBINIT to CMainWindow::ChooseColor It had failed to set initial color. CORE-18867 --- base/applications/mspaint/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 971bfbba622..8d328de1e84 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -159,6 +159,7 @@ BOOL CMainWindow::ChooseColor(IN OUT COLORREF *prgbColor) choosecolor.lpCustColors = custColors; } + choosecolor.Flags = CC_RGBINIT; choosecolor.rgbResult = *prgbColor; if (!::ChooseColor(&choosecolor)) return FALSE;

1 0

[reactos] 01/01: [MSPAINT] Scrolled canvas has defects in dragging a selection
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb245ff7119466d05d000… commit cb245ff7119466d05d000343ac6a3c0db996b3a1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 14:57:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 14:57:59 2023 +0900 [MSPAINT] Scrolled canvas has defects in dragging a selection CORE-18990, CORE-18867 --- base/applications/mspaint/canvas.cpp | 18 +++++++++--------- base/applications/mspaint/canvas.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index e6977e3c2c0..a6aa9b461f9 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -258,7 +258,7 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam { if (bLeftButton) { - UnZoomed(pt); + CanvasToImage(pt); StartSelectionDrag(hitSelection, pt); } return 0; @@ -741,7 +741,7 @@ VOID CCanvasWindow::finishDrawing() Invalidate(FALSE); } -CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptZoomed) +CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptImage) { if (!selectionModel.m_bShow) return HIT_NONE; @@ -751,28 +751,28 @@ CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptZoomed) ::OffsetRect(&rcSelection, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); - return getSizeBoxHitTest(ptZoomed, &rcSelection); + return getSizeBoxHitTest(ptImage, &rcSelection); } -VOID CCanvasWindow::StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed) +VOID CCanvasWindow::StartSelectionDrag(CANVAS_HITTEST hit, POINT ptImage) { m_hitSelection = hit; - selectionModel.m_ptHit = ptUnZoomed; + selectionModel.m_ptHit = ptImage; selectionModel.TakeOff(); SetCapture(); Invalidate(FALSE); } -VOID CCanvasWindow::SelectionDragging(POINT ptUnZoomed) +VOID CCanvasWindow::SelectionDragging(POINT ptImage) { - selectionModel.Dragging(m_hitSelection, ptUnZoomed); + selectionModel.Dragging(m_hitSelection, ptImage); Invalidate(FALSE); } -VOID CCanvasWindow::EndSelectionDrag(POINT ptUnZoomed) +VOID CCanvasWindow::EndSelectionDrag(POINT ptImage) { - selectionModel.Dragging(m_hitSelection, ptUnZoomed); + selectionModel.Dragging(m_hitSelection, ptImage); m_hitSelection = HIT_NONE; Invalidate(FALSE); } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 4a41652adc0..a201bdc2c7a 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -61,10 +61,10 @@ protected: VOID OnHVScroll(WPARAM wParam, INT fnBar); VOID drawZoomFrame(INT mouseX, INT mouseY); - CANVAS_HITTEST SelectionHitTest(POINT ptZoomed); - VOID StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed); - VOID SelectionDragging(POINT ptUnZoomed); - VOID EndSelectionDrag(POINT ptUnZoomed); + CANVAS_HITTEST SelectionHitTest(POINT ptImage); + VOID StartSelectionDrag(CANVAS_HITTEST hit, POINT ptImage); + VOID SelectionDragging(POINT ptImage); + VOID EndSelectionDrag(POINT ptImage); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 0

[reactos] 01/01: [MSPAINT] Follow-up of #5332 (9ff9580)
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62b6859a672765e28df9b… commit 62b6859a672765e28df9b36964ecf549a8aada3d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 14:18:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 14:18:12 2023 +0900 [MSPAINT] Follow-up of #5332 (9ff9580) Simplify the epilogue code of CCanvasWindow::OnSetCursor by using bHandle variable. CORE-18867 --- base/applications/mspaint/canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index c9f2ec887ba..e6977e3c2c0 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -668,7 +668,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL } if (selectionModel.m_bShow || !setCursorOnSizeBox(CanvasHitTest(pt))) - ::SetCursor(::LoadCursor(NULL, IDC_ARROW)); + bHandled = FALSE; return 0; }

1 0

[reactos] 01/01: [MSPAINT] Fix the type of cursor displayed when overlaying scrollbars (#5332)
by Jose Carlos Jesus 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff9580fb0c873bddca8c… commit 9ff9580fb0c873bddca8c29551aad879090dc2d4 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Jun 13 00:01:39 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 13:01:39 2023 +0900 [MSPAINT] Fix the type of cursor displayed when overlaying scrollbars (#5332) When the window size is smaller than the image size in both directions, the wrong cursor is displayed when hovering the mouse over the scrollbars. Readjust position for file date and file size objects, to fit all text. CORE-18867 --- base/applications/mspaint/canvas.cpp | 10 ++++++++++ base/applications/mspaint/lang/pt-PT.rc | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 38951215c42..c9f2ec887ba 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -621,6 +621,15 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL ::GetCursorPos(&pt); ScreenToClient(&pt); + CRect rcClient; + GetClientRect(&rcClient); + + if (!::PtInRect(&rcClient, pt)) + { + bHandled = FALSE; + return 0; + } + CANVAS_HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -632,6 +641,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL CRect rcImage; GetImageRect(rcImage); ImageToCanvas(rcImage); + if (::PtInRect(&rcImage, pt)) { switch (toolsModel.GetActiveTool()) diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f67a2339464..ef8a793a3c1 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -151,9 +151,9 @@ BEGIN LTEXT "Data do ficheiro:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Tamanho no disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "Resolução:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 80, 5, 90, 10 + LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 80, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 80, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unidades", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "P&olegadas", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10

1 0

[reactos] 01/01: [MMSYS] Use PWSTR instead of PWCHAR for string (#5333)
by Thamatip Chitpong 12 Jun '23

12 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da25b73c2ac2ec15e498… commit 3da25b73c2ac2ec15e498ebb55862401ef67f163 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Jun 13 02:52:56 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 12 21:52:56 2023 +0200 [MMSYS] Use PWSTR instead of PWCHAR for string (#5333) Use PWSTR instead of PWCHAR for string Constify some function arguments --- dll/cpl/mmsys/audio.c | 2 +- dll/cpl/mmsys/mmsys.c | 2 +- dll/cpl/mmsys/sounds.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dll/cpl/mmsys/audio.c b/dll/cpl/mmsys/audio.c index 2841cc2127c..c3bf27bd9f9 100644 --- a/dll/cpl/mmsys/audio.c +++ b/dll/cpl/mmsys/audio.c @@ -162,7 +162,7 @@ InitAudioDlg(HWND hwnd, PGLOBAL_DATA pGlobalData) } VOID -UpdateRegistryString(HWND hwnd, INT ctrl, LPWSTR key, LPWSTR value) +UpdateRegistryString(HWND hwnd, INT ctrl, LPCWSTR key, LPCWSTR value) { HWND hwndCombo = GetDlgItem(hwnd, ctrl); INT CurSel = SendMessageW(hwndCombo, CB_GETCURSEL, 0, 0); diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index bde437eda15..4cd0aa66823 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -365,7 +365,7 @@ IsSoftwareBusPnpEnumeratorInstalled() } DWORD -InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList) +InstallSoftwareBusPnpEnumerator(LPCWSTR InfPath, LPCWSTR HardwareIdList) { HDEVINFO DeviceInfoSet = INVALID_HANDLE_VALUE; SP_DEVINFO_DATA DeviceInfoData; diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index cec3e34e273..40b2d09a06b 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -20,9 +20,9 @@ typedef struct _LABEL_MAP { - PWCHAR szName; - PWCHAR szDesc; - PWCHAR szIcon; + PWSTR szName; + PWSTR szDesc; + PWSTR szIcon; struct _APP_MAP *AppMap; struct _LABEL_MAP *Next; } LABEL_MAP, *PLABEL_MAP; @@ -82,7 +82,7 @@ LPWSTR MakeFilter(LPWSTR psz) return psz; } -PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PWCHAR szName) +PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PCWSTR szName) { PLABEL_MAP pMap = pGlobalData->pLabelMap; @@ -172,7 +172,7 @@ FreeLabelMap(PGLOBAL_DATA pGlobalData) } } -PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PWCHAR szName) +PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PCWSTR szName) { PAPP_MAP pMap = pGlobalData->pAppMap; @@ -201,7 +201,7 @@ FreeAppMap(PGLOBAL_DATA pGlobalData) } } -PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PWCHAR AppName, PWCHAR LabelName) +PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PCWSTR AppName, PCWSTR LabelName) { PLABEL_CONTEXT pLabelContext; @@ -236,7 +236,7 @@ PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT BOOL -LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PWCHAR szSubKey) +LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PCWSTR szSubKey) { HKEY hSubKey; DWORD cbValue; @@ -350,7 +350,7 @@ LoadEventLabels(PGLOBAL_DATA pGlobalData) BOOL -AddSoundProfile(HWND hwndDlg, HKEY hKey, PWCHAR szSubKey, BOOL SetDefault) +AddSoundProfile(HWND hwndDlg, HKEY hKey, PCWSTR szSubKey, BOOL SetDefault) { HKEY hSubKey; WCHAR szValue[MAX_PATH]; @@ -467,7 +467,7 @@ EnumerateSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey) } -PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PWCHAR szName) +PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PCWSTR szName) { LRESULT lCount, lIndex, lResult; PSOUND_SCHEME_CONTEXT pScheme; @@ -533,7 +533,7 @@ FreeSoundProfiles(HWND hwndDlg) } BOOL -ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szProfile, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) +ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szProfile, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { HKEY hSubKey; WCHAR szValue[MAX_PATH]; @@ -594,7 +594,7 @@ ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szPro DWORD -ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP pAppMap) +ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP pAppMap) { HKEY hSubKey; DWORD dwNumProfiles; @@ -653,7 +653,7 @@ ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLab DWORD -ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szAppName) +ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szAppName) { HKEY hSubKey; WCHAR szDefault[MAX_PATH]; @@ -817,7 +817,7 @@ LoadSoundFiles(HWND hwndDlg) { WCHAR szList[256]; WCHAR szPath[MAX_PATH]; - PWCHAR ptr; + PWSTR ptr; WIN32_FIND_DATAW FileData; HANDLE hFile; LRESULT lResult; @@ -879,7 +879,7 @@ VOID FreeSoundFiles(HWND hwndDlg) { LRESULT lCount, lIndex, lResult; - PWCHAR pSoundPath; + PWSTR pSoundPath; HWND hwndComboBox; hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_LIST); @@ -895,7 +895,7 @@ FreeSoundFiles(HWND hwndDlg) continue; } - pSoundPath = (PWCHAR)lResult; + pSoundPath = (PWSTR)lResult; free(pSoundPath); } } @@ -1433,7 +1433,7 @@ SoundsDlgProc(HWND hwndDlg, break; } - if (_wcsicmp(pLabelContext->szValue, (PWCHAR)lResult) || (lIndex != pLabelContext->szValue[0])) + if (_wcsicmp(pLabelContext->szValue, (PWSTR)lResult) || (lIndex != pLabelContext->szValue[0])) { /* Update the tree view item image */ item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; @@ -1446,10 +1446,10 @@ SoundsDlgProc(HWND hwndDlg, /// /// Should store in current member /// - StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWCHAR)lResult); + StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWSTR)lResult); } - if (wcslen((PWCHAR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) + if (wcslen((PWSTR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); } @@ -1486,7 +1486,7 @@ SoundsDlgProc(HWND hwndDlg, case WM_NOTIFY: { PLABEL_CONTEXT pLabelContext; - PWCHAR ptr; + PWSTR ptr; LPNMHDR lpnm = (LPNMHDR)lParam; @@ -1549,7 +1549,7 @@ SoundsDlgProc(HWND hwndDlg, if (lResult == CB_ERR || lResult == 0) continue; - if (!wcscmp((PWCHAR)lResult, pLabelContext->szValue)) + if (!wcscmp((PWSTR)lResult, pLabelContext->szValue)) { ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); return FALSE;

1 0

[reactos] 01/01: [MSPAINT] Add (CS_HREDRAW | CS_VREDRAW) style to CCanvasWindow
by Katayama Hirofumi MZ 12 Jun '23

12 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83762575e18a307fb7e69… commit 83762575e18a307fb7e692613a1f7f6fc2e52c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 12 21:12:37 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 12 21:12:37 2023 +0900 [MSPAINT] Add (CS_HREDRAW | CS_VREDRAW) style to CCanvasWindow Reduce repainting defects. CORE-18867 --- base/applications/mspaint/canvas.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index e884fa4df2a..4a41652adc0 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -11,7 +11,8 @@ class CCanvasWindow : public CWindowImpl<CCanvasWindow> { public: - DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), CS_DBLCLKS, COLOR_APPWORKSPACE) + DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_APPWORKSPACE) BEGIN_MSG_MAP(CCanvasWindow) MESSAGE_HANDLER(WM_SIZE, OnSize)

1 0

[reactos] 01/01: [SHELL32] Strip leftover in CDefView::FillFileMenu() (#5330)
by Joachim Henze 11 Jun '23

11 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3164a0f557bdc2cc9dfd… commit d3164a0f557bdc2cc9dfd86612131f6cf180d462 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jun 11 20:53:25 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 11 20:53:25 2023 +0200 [SHELL32] Strip leftover in CDefView::FillFileMenu() (#5330) In 0.4.14-dev-955-g 1cf564c25f532c32f9fae891f17a70e62d5c1c14 Katayama experimented with populating explorers file-menu when no object is selected. Later we found out, that none of the new entries introduced by that commit really made sense and even created duplicates. So the commit was reverted by 0.4.15-dev-6039-g 0fa4edebd9125b9ca7a4256edbea7675e2152c7e 'Revert CDefView::FillFileMenu (#5278)' CORE-18429 But it seems that not all parts were properly reverted back then, maybe because 6 lines of new code were written between the two lines in the meantime. --- dll/win32/shell32/CDefView.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 880afa6e457..ebcfa767090 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1348,8 +1348,6 @@ HRESULT CDefView::FillFileMenu() DeleteMenu(hFileMenu, i, MF_BYPOSITION); } - m_cidl = m_ListView.GetSelectedCount(); - /* In case we still have this left over, clean it up! */ if (m_pFileMenu) {

1 0

[reactos] 01/01: [WIN32K:NTUSER] Fix an unintialized user's token variable case
by George Bișoc 11 Jun '23

11 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f9be539856b392b99dae… commit 0f9be539856b392b99dae3d8bdecedb0b9de44fd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 11 00:00:03 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 11 18:14:02 2023 +0200 [WIN32K:NTUSER] Fix an unintialized user's token variable case And remove the "!NT_SUCCESS(Status)" check which is excessive, the expected status will always be STATUS_BUFFER_TOO_SMALL anyway. This should fix some compilation warnings spotted by GCC. Courtesy goes to Hermes for letting me know of these warnings. --- win32ss/user/ntuser/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/security.c b/win32ss/user/ntuser/security.c index 276d01bfe16..2ed4e1b66a0 100644 --- a/win32ss/user/ntuser/security.c +++ b/win32ss/user/ntuser/security.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Win32k subsystem * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Security infrastructure of NTUSER component of Win32k - * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * COPYRIGHT: Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -170,7 +170,7 @@ IntQueryUserSecurityIdentification( _Out_ PTOKEN_USER *User) { NTSTATUS Status; - PTOKEN_USER UserToken; + PTOKEN_USER UserToken = NULL; HANDLE Token; ULONG BufferLength; @@ -196,7 +196,7 @@ IntQueryUserSecurityIdentification( NULL, 0, &BufferLength); - if (!NT_SUCCESS(Status) && Status == STATUS_BUFFER_TOO_SMALL) + if (Status == STATUS_BUFFER_TOO_SMALL) { /* * Allocate some memory for the buffer @@ -212,6 +212,12 @@ IntQueryUserSecurityIdentification( return STATUS_NO_MEMORY; } } + else if (!NT_SUCCESS(Status)) + { + ERR("IntQueryUserSecurityIdentification(): Failed to query the necessary length for the buffer (Status 0x%08lx)!\n", Status); + ZwClose(Token); + return Status; + } /* Query the user now as we have plenty of space to hold it */ Status = ZwQueryInformationToken(Token,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2023