Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [DDK:NDIS] Fix definition of broadcast address macro (#5155)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=557306f5c0364814f250a… commit 557306f5c0364814f250a9a24401c0fcc8220768 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Mar 18 21:57:52 2023 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 18 16:57:52 2023 +0100 [DDK:NDIS] Fix definition of broadcast address macro (#5155) ff:ff:ff:ff:ff:ff is the broadcast MAC address. CORE-8724 --- sdk/include/ddk/xfilter.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/include/ddk/xfilter.h b/sdk/include/ddk/xfilter.h index b4ad7bc3fc3..4a9facd1b64 100644 --- a/sdk/include/ddk/xfilter.h +++ b/sdk/include/ddk/xfilter.h @@ -30,7 +30,9 @@ extern "C" { #define ETH_LENGTH_OF_ADDRESS 6 #define ETH_IS_BROADCAST(Address) \ - ((((PUCHAR)(Address))[0] == ((UCHAR)0xff)) && (((PUCHAR)(Address))[1] == ((UCHAR)0xff))) + ((((PUCHAR)(Address))[0] == ((UCHAR)0xff)) && (((PUCHAR)(Address))[1] == ((UCHAR)0xff)) && \ + (((PUCHAR)(Address))[2] == ((UCHAR)0xff)) && (((PUCHAR)(Address))[3] == ((UCHAR)0xff)) && \ + (((PUCHAR)(Address))[4] == ((UCHAR)0xff)) && (((PUCHAR)(Address))[5] == ((UCHAR)0xff))) #define ETH_IS_MULTICAST(Address) \ (BOOLEAN)(((PUCHAR)(Address))[0] & ((UCHAR)0x01))

1 year, 9 months

[reactos] 01/01: [MSPAINT] Save ToolBox visibility (#5167)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c7c0fa7a76c395ecbe97… commit 1c7c0fa7a76c395ecbe979f066fa150ac618e65c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 18 17:19:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Mar 18 17:20:43 2023 +0900 [MSPAINT] Save ToolBox visibility (#5167) According to my registry analysis, the target value is HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Applets\Paint\General-Bar3:Visible. - Add ShowToolBox registry setting. CORE-18867 --- base/applications/mspaint/main.cpp | 4 +++- base/applications/mspaint/registry.cpp | 13 +++++++++++++ base/applications/mspaint/registry.h | 1 + base/applications/mspaint/winproc.cpp | 3 ++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 75e80757a39..933ef86cf6e 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -193,7 +193,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument haccel = LoadAccelerators(hThisInstance, MAKEINTRESOURCE(800)); RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350}; - toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE); + toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD); + if (registrySettings.ShowToolBox) + toolBoxContainer.ShowWindow(SW_SHOWNOACTIVATE); /* creating the tool settings child window */ RECT toolSettingsWindowPos = {5, 208, 5 + 42, 208 + 140}; toolSettingsWindow.Create(toolBoxContainer.m_hWnd, toolSettingsWindowPos, NULL, WS_CHILD | WS_VISIBLE); diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index f23ce12e8f4..bb97301a11b 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -73,6 +73,7 @@ void RegistrySettings::LoadPresets(INT nCmdShow) ShowTextTool = TRUE; ShowStatusBar = TRUE; ShowPalette = TRUE; + ShowToolBox = TRUE; LOGFONT lf; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); @@ -139,6 +140,12 @@ void RegistrySettings::Load(INT nCmdShow) ReadString(text, _T("TypeFaceName"), strFontName, strFontName); } + CRegKey bar3; + if (bar3.Open(paint, _T("General-Bar3"), KEY_READ) == ERROR_SUCCESS) + { + ReadDWORD(bar3, _T("Visible"), ShowToolBox); + } + CRegKey bar4; if (bar4.Open(paint, _T("General-Bar4"), KEY_READ) == ERROR_SUCCESS) { @@ -202,6 +209,12 @@ void RegistrySettings::Store() text.SetStringValue(_T("TypeFaceName"), strFontName); } + CRegKey bar3; + if (bar3.Create(paint, _T("General-Bar3")) == ERROR_SUCCESS) + { + bar3.SetDWORDValue(_T("Visible"), ShowToolBox); + } + CRegKey bar4; if (bar4.Create(paint, _T("General-Bar4")) == ERROR_SUCCESS) { diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index ce932a1c773..d70e82ede48 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -42,6 +42,7 @@ public: DWORD ShowTextTool; DWORD ShowStatusBar; DWORD ShowPalette; + DWORD ShowToolBox; enum WallpaperStyle { TILED, diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index fc99822f5ee..e121a4f53cf 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -749,7 +749,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWTOOLBOX: - toolBoxContainer.ShowWindow(::IsWindowVisible(toolBoxContainer) ? SW_HIDE : SW_SHOW); + registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); + toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE); alignChildrenToMainWindow(); break; case IDM_VIEWCOLORPALETTE:

1 year, 9 months

[reactos] 01/01: [MSPAINT] Save paletteWindow visibility (#5167)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ed7db5acbb645f4d0844… commit 5ed7db5acbb645f4d08449a003ac62a4c5d907d9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 18 17:12:28 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 18 17:12:28 2023 +0900 [MSPAINT] Save paletteWindow visibility (#5167) According to my registry analysis, HKCU\Software\Microsoft\Windows\CurrentVersion\Applets\Paint\General-Bar4:Visible is the target value. - Improve ReadDWORD helper function. - Add ShowPalette registry setting. - Simplify RegistrySettings::Load and RegistrySettings::Store. CORE-18867 --- base/applications/mspaint/main.cpp | 4 +- base/applications/mspaint/registry.cpp | 85 ++++++++++++++++++++-------------- base/applications/mspaint/registry.h | 1 + base/applications/mspaint/winproc.cpp | 3 +- 4 files changed, 57 insertions(+), 36 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 2df191af3c8..75e80757a39 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -200,7 +200,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the palette child window */ RECT paletteWindowPos = {56, 9, 56 + 255, 9 + 32}; - paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE, WS_EX_STATICEDGE); + paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD, WS_EX_STATICEDGE); + if (registrySettings.ShowPalette) + paletteWindow.ShowWindow(SW_SHOWNOACTIVATE); // creating the canvas RECT canvasWindowPos = {0, 0, 0 + 500, 0 + 500}; diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 46119989429..f23ce12e8f4 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -15,14 +15,11 @@ #include <shlobj.h> /* FUNCTIONS ********************************************************/ -static DWORD ReadDWORD(CRegKey &key, LPCTSTR lpName, DWORD &dwValue, BOOL bCheckForDef) +static void ReadDWORD(CRegKey &key, LPCTSTR lpName, DWORD &dwValue) { - DWORD dwPrev = dwValue; - - if (key.QueryDWORDValue(lpName, dwValue) != ERROR_SUCCESS || (bCheckForDef && dwValue == 0)) - dwValue = dwPrev; - - return dwPrev; + DWORD dwTemp; + if (key.QueryDWORDValue(lpName, dwTemp) == ERROR_SUCCESS) + dwValue = dwTemp; } static void ReadString(CRegKey &key, LPCTSTR lpName, CString &strValue, LPCTSTR lpDefault = TEXT("")) @@ -75,6 +72,7 @@ void RegistrySettings::LoadPresets(INT nCmdShow) FontsPositionY = 0; ShowTextTool = TRUE; ShowStatusBar = TRUE; + ShowPalette = TRUE; LOGFONT lf; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); @@ -92,28 +90,32 @@ void RegistrySettings::Load(INT nCmdShow) { LoadPresets(nCmdShow); + CRegKey paint; + if (paint.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint"), KEY_READ) != ERROR_SUCCESS) + return; + CRegKey view; - if (view.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), KEY_READ) == ERROR_SUCCESS) + if (view.Open(paint, _T("View"), KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(view, _T("BMPHeight"), BMPHeight, TRUE); - ReadDWORD(view, _T("BMPWidth"), BMPWidth, TRUE); - ReadDWORD(view, _T("GridExtent"), GridExtent, FALSE); - ReadDWORD(view, _T("NoStretching"), NoStretching, FALSE); - ReadDWORD(view, _T("ShowThumbnail"), ShowThumbnail, FALSE); - ReadDWORD(view, _T("SnapToGrid"), SnapToGrid, FALSE); - ReadDWORD(view, _T("ThumbHeight"), ThumbHeight, TRUE); - ReadDWORD(view, _T("ThumbWidth"), ThumbWidth, TRUE); - ReadDWORD(view, _T("ThumbXPos"), ThumbXPos, TRUE); - ReadDWORD(view, _T("ThumbYPos"), ThumbYPos, TRUE); - ReadDWORD(view, _T("UnitSetting"), UnitSetting, FALSE); - ReadDWORD(view, _T("ShowStatusBar"), ShowStatusBar, FALSE); + ReadDWORD(view, _T("BMPHeight"), BMPHeight); + ReadDWORD(view, _T("BMPWidth"), BMPWidth); + ReadDWORD(view, _T("GridExtent"), GridExtent); + ReadDWORD(view, _T("NoStretching"), NoStretching); + ReadDWORD(view, _T("ShowThumbnail"), ShowThumbnail); + ReadDWORD(view, _T("SnapToGrid"), SnapToGrid); + ReadDWORD(view, _T("ThumbHeight"), ThumbHeight); + ReadDWORD(view, _T("ThumbWidth"), ThumbWidth); + ReadDWORD(view, _T("ThumbXPos"), ThumbXPos); + ReadDWORD(view, _T("ThumbYPos"), ThumbYPos); + ReadDWORD(view, _T("UnitSetting"), UnitSetting); + ReadDWORD(view, _T("ShowStatusBar"), ShowStatusBar); ULONG pnBytes = sizeof(WINDOWPLACEMENT); view.QueryBinaryValue(_T("WindowPlacement"), &WindowPlacement, &pnBytes); } CRegKey files; - if (files.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Recent File List"), KEY_READ) == ERROR_SUCCESS) + if (files.Open(paint, _T("Recent File List"), KEY_READ) == ERROR_SUCCESS) { TCHAR szName[64]; for (INT i = 0; i < MAX_RECENT_FILES; ++i) @@ -124,19 +126,25 @@ void RegistrySettings::Load(INT nCmdShow) } CRegKey text; - if (text.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Text"), KEY_READ) == ERROR_SUCCESS) + if (text.Open(paint, _T("Text"), KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(text, _T("Bold"), Bold, FALSE); - ReadDWORD(text, _T("Italic"), Italic, FALSE); - ReadDWORD(text, _T("Underline"), Underline, FALSE); - ReadDWORD(text, _T("CharSet"), CharSet, FALSE); - ReadDWORD(text, _T("PointSize"), PointSize, FALSE); - ReadDWORD(text, _T("PositionX"), FontsPositionX, FALSE); - ReadDWORD(text, _T("PositionY"), FontsPositionY, FALSE); - ReadDWORD(text, _T("ShowTextTool"), ShowTextTool, FALSE); + ReadDWORD(text, _T("Bold"), Bold); + ReadDWORD(text, _T("Italic"), Italic); + ReadDWORD(text, _T("Underline"), Underline); + ReadDWORD(text, _T("CharSet"), CharSet); + ReadDWORD(text, _T("PointSize"), PointSize); + ReadDWORD(text, _T("PositionX"), FontsPositionX); + ReadDWORD(text, _T("PositionY"), FontsPositionY); + ReadDWORD(text, _T("ShowTextTool"), ShowTextTool); ReadString(text, _T("TypeFaceName"), strFontName, strFontName); } + CRegKey bar4; + if (bar4.Open(paint, _T("General-Bar4"), KEY_READ) == ERROR_SUCCESS) + { + ReadDWORD(bar4, _T("Visible"), ShowPalette); + } + // Fix the bitmap size if too large if (BMPWidth > 5000) BMPWidth = (GetSystemMetrics(SM_CXSCREEN) * 6) / 10; @@ -146,9 +154,12 @@ void RegistrySettings::Load(INT nCmdShow) void RegistrySettings::Store() { + CRegKey paint; + if (paint.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint")) != ERROR_SUCCESS) + return; + CRegKey view; - if (view.Create(HKEY_CURRENT_USER, - _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View")) == ERROR_SUCCESS) + if (view.Create(paint, _T("View")) == ERROR_SUCCESS) { view.SetDWORDValue(_T("BMPHeight"), BMPHeight); view.SetDWORDValue(_T("BMPWidth"), BMPWidth); @@ -167,7 +178,7 @@ void RegistrySettings::Store() } CRegKey files; - if (files.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Recent File List")) == ERROR_SUCCESS) + if (files.Create(paint, _T("Recent File List")) == ERROR_SUCCESS) { TCHAR szName[64]; for (INT iFile = 0; iFile < MAX_RECENT_FILES; ++iFile) @@ -178,7 +189,7 @@ void RegistrySettings::Store() } CRegKey text; - if (text.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Text")) == ERROR_SUCCESS) + if (text.Create(paint, _T("Text")) == ERROR_SUCCESS) { text.SetDWORDValue(_T("Bold"), Bold); text.SetDWORDValue(_T("Italic"), Italic); @@ -190,6 +201,12 @@ void RegistrySettings::Store() text.SetDWORDValue(_T("ShowTextTool"), ShowTextTool); text.SetStringValue(_T("TypeFaceName"), strFontName); } + + CRegKey bar4; + if (bar4.Create(paint, _T("General-Bar4")) == ERROR_SUCCESS) + { + bar4.SetDWORDValue(_T("Visible"), ShowPalette); + } } void RegistrySettings::SetMostRecentFile(LPCTSTR szPathName) diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index b891d523c23..ce932a1c773 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -41,6 +41,7 @@ public: DWORD FontsPositionY; DWORD ShowTextTool; DWORD ShowStatusBar; + DWORD ShowPalette; enum WallpaperStyle { TILED, diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 471853bad20..fc99822f5ee 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -753,7 +753,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH alignChildrenToMainWindow(); break; case IDM_VIEWCOLORPALETTE: - paletteWindow.ShowWindow(::IsWindowVisible(paletteWindow) ? SW_HIDE : SW_SHOW); + registrySettings.ShowPalette = !paletteWindow.IsWindowVisible(); + paletteWindow.ShowWindow(registrySettings.ShowPalette ? SW_SHOWNOACTIVATE : SW_HIDE); alignChildrenToMainWindow(); break; case IDM_VIEWSTATUSBAR:

1 year, 9 months

[reactos] 03/03: [NTOS:KD] Improve the display of the output providers' signons.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=422621622d45ef63ee925… commit 422621622d45ef63ee9258e83fd8badbf79f1aaf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 14 18:50:30 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 18 03:42:32 2023 +0100 [NTOS:KD] Improve the display of the output providers' signons. --- ntoskrnl/kd/kdio.c | 6 +++--- ntoskrnl/kd/kdmain.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 396c0432317..be47e04c1c7 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -229,7 +229,7 @@ KdpDebugLogInit( /* Register for later BootPhase 2 reinitialization */ DispatchTable->KdpInitRoutine = KdpDebugLogInit; - HalDisplayString("\r\n File log debugging enabled\r\n\r\n"); + HalDisplayString(" File log debugging enabled\r\n"); } else if (BootPhase >= 2) { @@ -413,7 +413,7 @@ KdpSerialInit( } else if (BootPhase == 1) { - HalDisplayString("\r\n Serial debugging enabled\r\n\r\n"); + HalDisplayString(" Serial debugging enabled\r\n"); } return STATUS_SUCCESS; @@ -526,7 +526,7 @@ KdpScreenInit( /* Take control of the display */ KdpScreenAcquire(); - HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); + HalDisplayString(" Screen debugging enabled\r\n"); } return STATUS_SUCCESS; diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index abd358da0fc..6281f43ab8f 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -305,6 +305,9 @@ KdDebuggerInitialize1( BOOLEAN Success = FALSE; BOOLEAN ReinitForPhase2 = FALSE; + /* Make space for the displayed providers' signons */ + HalDisplayString("\r\n"); + /* Call the registered providers */ for (CurrentEntry = KdProviders.Flink; CurrentEntry != &KdProviders; NOTHING) @@ -329,6 +332,9 @@ KdDebuggerInitialize1( ReinitForPhase2 = (ReinitForPhase2 || CurrentTable->KdpInitRoutine); } + /* Make space for the displayed providers' signons */ + HalDisplayString("\r\n"); + NtGlobalFlag |= FLG_STOP_ON_EXCEPTION; /* If we don't need to reinitialize providers for Phase 2, we are done */

1 year, 9 months

[reactos] 02/03: [NTOS:MM] Simplify definitions of MM_SYSLDR_NO_IMPORTS and MM_SYSLDR_BOOT_LOADED.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8bcc8d7a1551c47bdacd… commit a8bcc8d7a1551c47bdacdf544b89df9b3679aa7a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Mar 15 20:31:28 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 18 03:42:31 2023 +0100 [NTOS:MM] Simplify definitions of MM_SYSLDR_NO_IMPORTS and MM_SYSLDR_BOOT_LOADED. --- ntoskrnl/mm/ARM3/miarm.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 60197cda74e..1776b69a918 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -197,13 +197,8 @@ extern const ULONG MmProtectToValue[32]; // // Special values for LoadedImports // -#ifdef _WIN64 -#define MM_SYSLDR_NO_IMPORTS (PVOID)0xFFFFFFFFFFFFFFFEULL -#define MM_SYSLDR_BOOT_LOADED (PVOID)0xFFFFFFFFFFFFFFFFULL -#else -#define MM_SYSLDR_NO_IMPORTS (PVOID)0xFFFFFFFE -#define MM_SYSLDR_BOOT_LOADED (PVOID)0xFFFFFFFF -#endif +#define MM_SYSLDR_NO_IMPORTS ((PVOID)(ULONG_PTR)-2) +#define MM_SYSLDR_BOOT_LOADED ((PVOID)(ULONG_PTR)-1) #define MM_SYSLDR_SINGLE_ENTRY 0x1 //

1 year, 9 months

[reactos] 01/03: [SDK] driverspecs.h: Add missing dummy _IRQL_limited_to_() definition (when _PREFAST_ is not defined).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6c8155239a6f402c6b39… commit f6c8155239a6f402c6b3905d08a51f0befe877a2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 18 03:06:54 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 18 03:42:26 2023 +0100 [SDK] driverspecs.h: Add missing dummy _IRQL_limited_to_() definition (when _PREFAST_ is not defined). Addendum to commit 8a688204. --- sdk/include/psdk/driverspecs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/driverspecs.h b/sdk/include/psdk/driverspecs.h index b440566d460..5072d8430d3 100644 --- a/sdk/include/psdk/driverspecs.h +++ b/sdk/include/psdk/driverspecs.h @@ -235,6 +235,7 @@ __PRIMOP(int, _Is_driver_(void);) #define _IRQL_saves_ #define _IRQL_saves_global_(kind,param) #define _IRQL_uses_cancel_ +#define _IRQL_limited_to_(level) #define _Kernel_clear_do_init_(yesNo) #define _Kernel_float_restored_ #define _Kernel_float_saved_

1 year, 9 months

[reactos] 01/01: [MSPAINT] Encapsulation: hNontranspIcon and hTranspIcon

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9f3790aa4f1a1a211c6d… commit e9f3790aa4f1a1a211c6dbbfa68c2e955fe7cda6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 18 08:24:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Mar 18 08:24:19 2023 +0900 [MSPAINT] Encapsulation: hNontranspIcon and hTranspIcon CORE-18867 --- base/applications/mspaint/main.cpp | 6 ------ base/applications/mspaint/toolsettings.cpp | 17 +++++++++++++++-- base/applications/mspaint/toolsettings.h | 4 ++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index bd83e56a04a..2df191af3c8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -192,12 +192,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument SetMenu(hwnd, menu); haccel = LoadAccelerators(hThisInstance, MAKEINTRESOURCE(800)); - /* preloading the draw transparent/nontransparent icons for later use */ - hNontranspIcon = - (HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_NONTRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); - hTranspIcon = - (HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); - RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350}; toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the tool settings child window */ diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 19f826ea825..dc1883bf47e 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -15,6 +15,12 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, WINBOOL& bHandled) { + /* preloading the draw transparent/nontransparent icons for later use */ + m_hNontranspIcon = (HICON)LoadImage(hProgInstance, MAKEINTRESOURCE(IDI_NONTRANSPARENT), + IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); + m_hTranspIcon = (HICON)LoadImage(hProgInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), + IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); + RECT trackbarZoomPos = {1, 1, 1 + 40, 1 + 64}; trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); trackbarZoom.SendMessage(TBM_SETRANGE, (WPARAM) TRUE, MAKELPARAM(0, 6)); @@ -22,6 +28,13 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, W return 0; } +LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + ::DestroyIcon(m_hNontranspIcon); + ::DestroyIcon(m_hTranspIcon); + return 0; +} + LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (!zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0)) @@ -50,8 +63,8 @@ LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BO SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); Rectangle(hdc, 2, toolsModel.IsBackgroundTransparent() * 31 + 2, 41, toolsModel.IsBackgroundTransparent() * 31 + 33); DeleteObject(SelectObject(hdc, oldPen)); - DrawIconEx(hdc, 1, 2, hNontranspIcon, 40, 30, 0, NULL, DI_NORMAL); - DrawIconEx(hdc, 1, 33, hTranspIcon, 40, 30, 0, NULL, DI_NORMAL); + DrawIconEx(hdc, 1, 2, m_hNontranspIcon, 40, 30, 0, NULL, DI_NORMAL); + DrawIconEx(hdc, 1, 33, m_hTranspIcon, 40, 30, 0, NULL, DI_NORMAL); break; } case TOOL_RUBBER: diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index 4b06cb7960b..bd92d61a6ac 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -21,11 +21,15 @@ public: MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) END_MSG_MAP() CWindow trackbarZoom; + HICON m_hNontranspIcon; + HICON m_hTranspIcon; LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 9 months

[reactos] 01/01: [MSPAINT] Encapsulation: hCurFill, hCurColor etc.

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc3b53fef9892ea30b655… commit cc3b53fef9892ea30b655e851a27cd1f4a2e0898 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 18 08:09:26 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Mar 18 08:09:26 2023 +0900 [MSPAINT] Encapsulation: hCurFill, hCurColor etc. CORE-18867 --- base/applications/mspaint/globalvar.h | 6 ------ base/applications/mspaint/imgarea.cpp | 25 +++++++++++++++++-------- base/applications/mspaint/imgarea.h | 8 ++++++++ base/applications/mspaint/main.cpp | 12 ------------ 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index aa144275968..b0099e571f5 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -36,12 +36,6 @@ extern OPENFILENAME sfn; extern HICON hNontranspIcon; extern HICON hTranspIcon; -extern HCURSOR hCurFill; -extern HCURSOR hCurColor; -extern HCURSOR hCurZoom; -extern HCURSOR hCurPen; -extern HCURSOR hCurAirbrush; - extern HINSTANCE hProgInstance; extern TCHAR filepathname[1000]; diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 1d8b05024ce..aa116dcc8c1 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -8,12 +8,21 @@ * Katayama Hirofumi MZ */ -/* INCLUDES *********************************************************/ - #include "precomp.h" /* FUNCTIONS ********************************************************/ +LRESULT CImgAreaWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + m_hCurFill = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_FILL)); + m_hCurColor = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_COLOR)); + m_hCurZoom = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_ZOOM)); + m_hCurPen = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_PEN)); + m_hCurAirbrush = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); + + return 0; +} + void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) { HDC hdc; @@ -115,22 +124,22 @@ LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO switch (toolsModel.GetActiveTool()) { case TOOL_FILL: - SetCursor(hCurFill); + ::SetCursor(m_hCurFill); break; case TOOL_COLOR: - SetCursor(hCurColor); + ::SetCursor(m_hCurColor); break; case TOOL_ZOOM: - SetCursor(hCurZoom); + ::SetCursor(m_hCurZoom); break; case TOOL_PEN: - SetCursor(hCurPen); + ::SetCursor(m_hCurPen); break; case TOOL_AIRBRUSH: - SetCursor(hCurAirbrush); + ::SetCursor(m_hCurAirbrush); break; default: - SetCursor(LoadCursor(NULL, IDC_CROSS)); + ::SetCursor(::LoadCursor(NULL, IDC_CROSS)); } return 0; } diff --git a/base/applications/mspaint/imgarea.h b/base/applications/mspaint/imgarea.h index 306c94088e9..d7b44e5c4af 100644 --- a/base/applications/mspaint/imgarea.h +++ b/base/applications/mspaint/imgarea.h @@ -42,9 +42,17 @@ public: MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_CTLCOLOREDIT, OnCtlColorEdit) + MESSAGE_HANDLER(WM_CREATE, OnCreate) END_MSG_MAP() private: + HCURSOR m_hCurFill; + HCURSOR m_hCurColor; + HCURSOR m_hCurZoom; + HCURSOR m_hCurPen; + HCURSOR m_hCurAirbrush; + + LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index a1f11a87af9..bd83e56a04a 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -35,12 +35,6 @@ OPENFILENAME sfn; HICON hNontranspIcon; HICON hTranspIcon; -HCURSOR hCurFill; -HCURSOR hCurColor; -HCURSOR hCurZoom; -HCURSOR hCurPen; -HCURSOR hCurAirbrush; - HINSTANCE hProgInstance; TCHAR filepathname[1000]; @@ -204,12 +198,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument hTranspIcon = (HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR); - hCurFill = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_FILL)); - hCurColor = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_COLOR)); - hCurZoom = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_ZOOM)); - hCurPen = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_PEN)); - hCurAirbrush = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); - RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350}; toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the tool settings child window */

1 year, 9 months

[reactos] 01/01: [MSPAINT] Add Static Edge to toolbars

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d40de8f47c955bd80310a… commit d40de8f47c955bd80310a2ec6715825637e845a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 19:18:07 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Mar 17 19:18:07 2023 +0900 [MSPAINT] Add Static Edge to toolbars - Add WS_EX_STATICEDGE to paletteWindow. - Remove CCS_NODIVIDER from toolbar. CORE-18867 --- base/applications/mspaint/main.cpp | 2 +- base/applications/mspaint/toolbox.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index aabe1992502..a1f11a87af9 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -218,7 +218,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the palette child window */ RECT paletteWindowPos = {56, 9, 56 + 255, 9 + 32}; - paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE); + paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE, WS_EX_STATICEDGE); // creating the canvas RECT canvasWindowPos = {0, 0, 0 + 500, 0 + 500}; diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index c989b882295..4af48b5917a 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -23,7 +23,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl /* NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. */ RECT toolbarPos = {0, 0, CX_TOOLBAR, CY_TOOLBAR}; DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | - TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER; + TBSTYLE_TOOLTIPS | TBSTYLE_FLAT; toolbar.Create(TOOLBARCLASSNAME, m_hWnd, toolbarPos, NULL, style); hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); toolbar.SendMessage(TB_SETIMAGELIST, 0, (LPARAM) hImageList);

1 year, 9 months

[reactos] 01/01: [MSPAINT] Delete useless "STATIC" control

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=868c7c4d53fdbea8fdbcd… commit 868c7c4d53fdbea8fdbcd6ecf01e9cff71550a5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 19:01:42 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Mar 17 19:01:42 2023 +0900 [MSPAINT] Delete useless "STATIC" control CORE-18867 --- base/applications/mspaint/main.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 75cc5862110..aabe1992502 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -210,9 +210,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument hCurPen = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_PEN)); hCurAirbrush = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); - CreateWindowEx(0, _T("STATIC"), NULL, WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, - hThisInstance, NULL); - RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350}; toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the tool settings child window */

1 year, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2023