Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT] Refactoring (_countof and resource.h) (#4202)
by Katayama Hirofumi MZ 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ca3ff5bc63c52c219b1c… commit 2ca3ff5bc63c52c219b1ccfadc4a383673b06c5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 10:44:56 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 10:44:56 2021 +0900 [MSPAINT] Refactoring (_countof and resource.h) (#4202) - Use Microsoft standard _countof macro instead of SIZEOF. - Rename definitions.h as resource.h. - Move some macro definitions to its proper place. CORE-17931 --- base/applications/mspaint/common.h | 22 ++++++++++++---- base/applications/mspaint/dialogs.cpp | 16 ++++++------ base/applications/mspaint/dib.cpp | 4 +-- base/applications/mspaint/history.h | 3 +++ base/applications/mspaint/main.cpp | 14 +++++----- base/applications/mspaint/precomp.h | 11 +++++++- .../mspaint/{definitions.h => resource.h} | 30 ++-------------------- base/applications/mspaint/rsrc.rc | 2 +- base/applications/mspaint/winproc.cpp | 12 ++++----- 9 files changed, 56 insertions(+), 58 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 7cdbb22c9bf..288bba64be4 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -2,7 +2,7 @@ * PROJECT: PAINT for ReactOS * LICENSE: LGPL * FILE: base/applications/mspaint/common.h - * PURPOSE: Commonly used functions + * PURPOSE: Commonly used functions and definitions * PROGRAMMERS: Benedikt Freisen * Stanislav Motylkov * Katayama Hirofumi MZ @@ -10,6 +10,22 @@ #pragma once +#define GRIP_SIZE 3 +#define MIN_ZOOM 125 +#define MAX_ZOOM 8000 + +/* width of the rectangle defined by a RECT structure */ +#define RECT_WIDTH(a) ((a).right - (a).left) + +/* height of the rectangle defined by a RECT structure */ +#define RECT_HEIGHT(a) ((a).bottom - (a).top) + +/* this simplifies checking and unchecking menu items */ +#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) + +/* this simplifies enabling or graying menu items */ +#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)) + /* FUNCTIONS ********************************************************/ BOOL zoomTo(int newZoom, int mouseX, int mouseY); @@ -24,7 +40,3 @@ static inline int UnZoomed(int xy) { return xy * 1000 / toolsModel.GetZoom(); } - -#define GRIP_SIZE 3 -#define MIN_ZOOM 125 -#define MAX_ZOOM 8000 diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 144b5ed7350..09a3e5cebfb 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -88,8 +88,8 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, { TCHAR date[100]; TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); + GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, _countof(date)); + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, _countof(temp)); _tcscat(date, _T(" ")); _tcscat(date, temp); CString strSize; @@ -166,17 +166,17 @@ LRESULT CAttributesDialog::OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO TCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, _tstoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); @@ -191,17 +191,17 @@ LRESULT CAttributesDialog::OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO TCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, _tstoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ecdbf22e339..53a12f71602 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -137,9 +137,9 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i // update filepathname if (name && name[0]) - GetFullPathName(name, SIZEOF(filepathname), filepathname, NULL); + GetFullPathName(name, _countof(filepathname), filepathname, NULL); else - LoadString(hProgInstance, IDS_DEFAULTFILENAME, filepathname, SIZEOF(filepathname)); + LoadString(hProgInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname)); // set title CString strTitle; diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 587d9c2e7a7..697b65bf128 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -8,6 +8,9 @@ #pragma once +/* HISTORYSIZE = number of possible undo-steps + 1 */ +#define HISTORYSIZE 11 + class ImageModel { private: diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index fe77e8ae097..b7e774a23f4 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -120,7 +120,7 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { hParent = GetParent(hwnd); TCHAR Path[MAX_PATH]; - SendMessage(hParent, CDM_GETFILEPATH, SIZEOF(Path), (LPARAM)Path); + SendMessage(hParent, CDM_GETFILEPATH, _countof(Path), (LPARAM)Path); LPTSTR pchTitle = _tcsrchr(Path, _T('\\')); if (pchTitle == NULL) pchTitle = _tcsrchr(Path, _T('/')); @@ -173,12 +173,12 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* initialize common controls library */ InitCommonControls(); - LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, SIZEOF(filepathname)); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname)); CPath pathFileName(filepathname); pathFileName.StripPath(); CString strTitle; strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); + LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, _countof(miniaturetitle)); /* load settings from registry */ registrySettings.Load(); @@ -279,9 +279,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument ofn.hInstance = hThisInstance; ofn.lpstrFilter = strImporters; ofn.lpstrFile = ofnFilename; - ofn.nMaxFile = SIZEOF(ofnFilename); + ofn.nMaxFile = _countof(ofnFilename); ofn.lpstrFileTitle = ofnFiletitle; - ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); + ofn.nMaxFileTitle = _countof(ofnFiletitle); ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY; ofn.lpstrDefExt = L"png"; @@ -295,9 +295,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sfn.hInstance = hThisInstance; sfn.lpstrFilter = strExporters; sfn.lpstrFile = sfnFilename; - sfn.nMaxFile = SIZEOF(sfnFilename); + sfn.nMaxFile = _countof(sfnFilename); sfn.lpstrFileTitle = sfnFiletitle; - sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); + sfn.nMaxFileTitle = _countof(sfnFiletitle); sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.lpfnHook = OFNHookProc; sfn.lpstrDefExt = L"png"; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 6bdbafceb30..d51eafa85e6 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,7 +21,16 @@ #include <shellapi.h> #include <htmlhelp.h> -#include "definitions.h" +#define WM_TOOLSMODELTOOLCHANGED (WM_APP + 0) +#define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) +#define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) +#define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) +#define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) +#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) +#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) +#define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) + +#include "resource.h" #include "drawing.h" #include "dib.h" #include "fullscreen.h" diff --git a/base/applications/mspaint/definitions.h b/base/applications/mspaint/resource.h similarity index 82% rename from base/applications/mspaint/definitions.h rename to base/applications/mspaint/resource.h index 26ea4f19549..fd3330a776b 100644 --- a/base/applications/mspaint/definitions.h +++ b/base/applications/mspaint/resource.h @@ -1,8 +1,8 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL - * FILE: base/applications/mspaint/definitions.h - * PURPOSE: Defines the resource ids and other stuff + * FILE: base/applications/mspaint/resource.h + * PURPOSE: Defines the resource IDs * PROGRAMMERS: Benedikt Freisen */ @@ -10,23 +10,6 @@ /* DEFINES **********************************************************/ -#define HISTORYSIZE 11 -/* HISTORYSIZE = number of possible undo-steps + 1 */ - -#define SIZEOF(a) (sizeof(a) / sizeof((a)[0])) -/* sizeof for string constants; equals max. number of characters */ - -#define RECT_WIDTH(a) ((a).right - (a).left) -/* width of the rectangle defined by a RECT structure */ - -#define RECT_HEIGHT(a) ((a).bottom - (a).top) -/* height of the rectangle defined by a RECT structure */ - -#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) -/* simplifies checking and unchecking menu items */ -#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)) -/* simplifies enabling or graying menu items */ - #define IDI_APPICON 500 #define IDB_TOOLBARICONS 510 @@ -219,12 +202,3 @@ #define IDS_LOADERRORTEXT 933 #define IDS_ENLARGEPROMPTTEXT 934 - -#define WM_TOOLSMODELTOOLCHANGED WM_APP -#define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) -#define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) -#define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) -#define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) -#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) -#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) -#define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 99c6941e91d..ccfc605fbd9 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -11,7 +11,7 @@ #include <windef.h> #include <winuser.h> -#include "definitions.h" +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Paint" #define REACTOS_STR_INTERNAL_NAME "mspaint" diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 1f251449669..026d5536def 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -94,7 +94,7 @@ void CMainWindow::saveImage(BOOL overwrite) else if (GetSaveFileName(&sfn) != 0) { imageModel.SaveImage(sfn.lpstrFile); - _tcsncpy(filepathname, sfn.lpstrFile, SIZEOF(filepathname)); + _tcsncpy(filepathname, sfn.lpstrFile, _countof(filepathname)); CString strTitle; strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)sfn.lpstrFileTitle); SetWindowText(strTitle); @@ -118,8 +118,8 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) TCHAR programname[20]; TCHAR shouldEnlargePromptText[100]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, SIZEOF(shouldEnlargePromptText)); + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, _countof(programname)); + LoadString(hProgInstance, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { @@ -212,7 +212,7 @@ LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& TCHAR droppedfile[MAX_PATH]; HDROP hDrop = (HDROP)wParam; - DragQueryFile(hDrop, 0, droppedfile, SIZEOF(droppedfile)); + DragQueryFile(hDrop, 0, droppedfile, _countof(droppedfile)); DragFinish(hDrop); ConfirmSave() && DoLoadImageFile(m_hWnd, droppedfile, TRUE); @@ -430,8 +430,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HICON paintIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); TCHAR infotitle[100]; TCHAR infotext[200]; - LoadString(hProgInstance, IDS_INFOTITLE, infotitle, SIZEOF(infotitle)); - LoadString(hProgInstance, IDS_INFOTEXT, infotext, SIZEOF(infotext)); + LoadString(hProgInstance, IDS_INFOTITLE, infotitle, _countof(infotitle)); + LoadString(hProgInstance, IDS_INFOTEXT, infotext, _countof(infotext)); ShellAbout(m_hWnd, infotitle, infotext, paintIcon); DeleteObject(paintIcon); break;

1 0

[reactos] 03/03: [HIVESYS] Add missing device classes to avoid error messages in log
by Victor Perevertkin 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad49da70a1615e397f07b… commit ad49da70a1615e397f07b1578a0bdb120a5d9924 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:22:16 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [HIVESYS] Add missing device classes to avoid error messages in log --- boot/bootdata/hivesys.inf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 39b0175b8b7..7f34f687d29 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -379,6 +379,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE103 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","SilentInstall",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"partmgr" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Display adapters" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Display" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"desk.cpl,DisplayClassInstaller" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-3" @@ -418,6 +423,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE103 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"System" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-27" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}",,0x00000000,"Human Interface Devices" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","Class",0x00000000,"HIDClass" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","Icon",0x00000000,"-24" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","NoInstallClass",0x00000000,"1" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}",,0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Icon",0x00000000,"-5"

1 0

[reactos] 02/03: [NTOS:PNP] Remove excessive error messages
by Victor Perevertkin 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd9436d7680cb68dce384… commit fd9436d7680cb68dce3841c7f161b82b4e1d0085 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:21:21 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [NTOS:PNP] Remove excessive error messages --- ntoskrnl/io/pnpmgr/devaction.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index c97f1fdd1c5..559fc087b0c 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -251,7 +251,10 @@ IopCreateDeviceInstancePath( Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); if (!NT_SUCCESS(Status)) { - DPRINT1("IopQueryDeviceCapabilities() failed (Status 0x%08lx)\n", Status); + if (Status != STATUS_NOT_SUPPORTED) + { + DPRINT1("IopQueryDeviceCapabilities() failed (Status 0x%08lx)\n", Status); + } RtlFreeUnicodeString(&DeviceId); return Status; }

1 0

[reactos] 01/03: [SCSIPORT] Reduce and improve debug printing
by Victor Perevertkin 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a6bd2704af03694fb6d8… commit 1a6bd2704af03694fb6d857b34481dd43ad39123 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:20:37 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [SCSIPORT] Reduce and improve debug printing --- drivers/storage/port/scsiport/fdo.c | 6 ++---- drivers/storage/port/scsiport/scsiport.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/storage/port/scsiport/fdo.c b/drivers/storage/port/scsiport/fdo.c index 8972c6f1aea..168c985c105 100644 --- a/drivers/storage/port/scsiport/fdo.c +++ b/drivers/storage/port/scsiport/fdo.c @@ -324,13 +324,11 @@ FdoScanAdapter( /* Clear the "in scan" flag */ lunExt->Flags &= ~SCSI_PORT_SCAN_IN_PROGRESS; - DPRINT("FdoScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", - InquiryData->DeviceType, pathId, targetId, lun); + DPRINT1("Found device of type %d at controller %d bus %d tid %d lun %d, PDO: %p\n", + InquiryData->DeviceType, PortExtension->PortNumber, pathId, targetId, lun, lunPDO); InsertTailList(&currentBus->LunsListHead, &lunExt->LunEntry); - DPRINT1("SCSIPORT: created lun device: %p Status: %x\n", lunPDO, status); - totalLUNs++; currentBus->LogicalUnitsCount++; targetFound = TRUE; diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index 8e6e3e3c198..9b7f7f9d6df 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -981,8 +981,6 @@ ScsiPortInitialize( break; } - DPRINT1("Created device: %wZ (%p)\n", &DeviceName, PortDeviceObject); - /* Set the buffering strategy here... */ PortDeviceObject->Flags |= DO_DIRECT_IO; PortDeviceObject->AlignmentRequirement = FILE_WORD_ALIGNMENT; /* FIXME: Is this really needed? */ @@ -2494,7 +2492,7 @@ TryNextAd: else { /* Info was not found, exit */ - DPRINT1("ZwOpenKey() failed with Status=0x%08X\n", Status); + DPRINT("ZwOpenKey() failed with Status=0x%08X\n", Status); return STATUS_DEVICE_DOES_NOT_EXIST; } }

1 0

[reactos] 01/01: [MSPAINT] Add const to some ImageModel methods
by Katayama Hirofumi MZ 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba117350eb3068ca7c2ed… commit ba117350eb3068ca7c2edf31a62c558530b9d86d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 09:49:36 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 28 09:49:36 2021 +0900 [MSPAINT] Add const to some ImageModel methods CORE-17931 --- base/applications/mspaint/history.cpp | 10 +++++----- base/applications/mspaint/history.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index b9f206cb165..221dffc52d7 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -164,17 +164,17 @@ void ImageModel::SaveImage(LPTSTR lpFileName) SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC); } -BOOL ImageModel::IsImageSaved() +BOOL ImageModel::IsImageSaved() const { return imageSaved; } -BOOL ImageModel::HasUndoSteps() +BOOL ImageModel::HasUndoSteps() const { return undoSteps > 0; } -BOOL ImageModel::HasRedoSteps() +BOOL ImageModel::HasRedoSteps() const { return redoSteps > 0; } @@ -191,12 +191,12 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk NotifyImageChanged(); } -int ImageModel::GetWidth() +int ImageModel::GetWidth() const { return GetDIBWidth(hBms[currInd]); } -int ImageModel::GetHeight() +int ImageModel::GetHeight() const { return GetDIBHeight(hBms[currInd]); } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 1c5110f7306..587d9c2e7a7 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -30,12 +30,12 @@ public: void Insert(HBITMAP hbm); void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); void SaveImage(LPTSTR lpFileName); - BOOL IsImageSaved(); - BOOL HasUndoSteps(); - BOOL HasRedoSteps(); + BOOL IsImageSaved() const; + BOOL HasUndoSteps() const; + BOOL HasRedoSteps() const; void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); - int GetWidth(); - int GetHeight(); + int GetWidth() const; + int GetHeight() const; void InvertColors(); void Clear(COLORREF color = 0x00ffffff); HDC GetDC();

1 0

[reactos] 01/01: [MSPAINT] Add const to some PaletteModel methods
by Katayama Hirofumi MZ 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4331b47c505eb4431c888… commit 4331b47c505eb4431c888fbfee9bd9d876893d63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 09:47:13 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 28 09:47:13 2021 +0900 [MSPAINT] Add const to some PaletteModel methods CORE-17931 --- base/applications/mspaint/palettemodel.cpp | 6 +++--- base/applications/mspaint/palettemodel.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 2236b06d6f0..021a9e0af7f 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -48,7 +48,7 @@ void PaletteModel::SelectPalette(int nPalette) NotifyPaletteChanged(); } -int PaletteModel::GetColor(int nIndex) +int PaletteModel::GetColor(int nIndex) const { if (nIndex < 28) return m_colors[nIndex]; @@ -65,7 +65,7 @@ void PaletteModel::SetColor(int nIndex, int newColor) } } -int PaletteModel::GetFgColor() +int PaletteModel::GetFgColor() const { return m_fgColor; } @@ -76,7 +76,7 @@ void PaletteModel::SetFgColor(int newColor) NotifyColorChanged(); } -int PaletteModel::GetBgColor() +int PaletteModel::GetBgColor() const { return m_bgColor; } diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index 04c86dbc664..2dccc2aa405 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -25,10 +25,10 @@ public: PaletteModel(); int SelectedPalette(); void SelectPalette(int nPalette); - int GetColor(int nIndex); + int GetColor(int nIndex) const; void SetColor(int nIndex, int newColor); - int GetFgColor(); + int GetFgColor() const; void SetFgColor(int newColor); - int GetBgColor(); + int GetBgColor() const; void SetBgColor(int newColor); };

1 0

[reactos] 01/01: [KMTESTS:IO] Avoid crashing in IoCreateFile test when pool allocations are failed
by Victor Perevertkin 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=188f5dc50aa14e89360e3… commit 188f5dc50aa14e89360e3ac5c962417efd53f9b1 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 14 05:05:07 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 02:51:52 2021 +0300 [KMTESTS:IO] Avoid crashing in IoCreateFile test when pool allocations are failed --- .../rostests/kmtests/ntos_io/IoCreateFile_drv.c | 52 ++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c b/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c index 33c295a53f4..241dd7b2a99 100644 --- a/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c +++ b/modules/rostests/kmtests/ntos_io/IoCreateFile_drv.c @@ -94,10 +94,15 @@ TestIrpHandler( { PREPARSE_DATA_BUFFER Reparse; - Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolZero(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; - RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (!Reparse) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + Reparse->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); Reparse->MountPointReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); @@ -109,31 +114,41 @@ TestIrpHandler( else if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && IoStack->FileObject->FileName.Buffer[1] == 'S') { + PREPARSE_DATA_BUFFER Reparse; + if (IoStack->Flags & SL_STOP_ON_SYMLINK) { Status = STATUS_STOPPED_ON_SYMLINK; + goto Finish; } - else + + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolZero(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; + + if (!Reparse) { - PREPARSE_DATA_BUFFER Reparse; - - Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); - Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; - - RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); - Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; - Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); - Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); - Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); - RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); - Irp->IoStatus.Information = IO_REPARSE_TAG_SYMLINK; - Status = STATUS_REPARSE; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; } + + Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; + Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); + Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); + Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); + RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); + Irp->IoStatus.Information = IO_REPARSE_TAG_SYMLINK; + Status = STATUS_REPARSE; } else { - Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Fcb), 'FwrI'); - RtlZeroMemory(Fcb, sizeof(*Fcb)); + Fcb = ExAllocatePoolZero(NonPagedPool, sizeof(*Fcb), 'FwrI'); + + if (!Fcb) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + ExInitializeFastMutex(&Fcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); Fcb->Header.AllocationSize.QuadPart = 0; @@ -157,6 +172,7 @@ TestIrpHandler( Status = STATUS_SUCCESS; } +Finish: Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[reactos] 01/01: [FLTMGR] CreateClientPort(): Fix ObInsertObject() error handling
by Serge Gautherie 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ba5051f7960b8e2275d0… commit 5ba5051f7960b8e2275d0018d1656438a68cf3a0 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:27:50 2021 +0300 [FLTMGR] CreateClientPort(): Fix ObInsertObject() error handling Avoid extra ObDereferenceObject(). CORE-17904 --- drivers/filters/fltmgr/Messaging.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index f4ed276eb4d..713e8fd1770 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -699,10 +699,12 @@ CreateClientPort(_In_ PFILE_OBJECT FileObject, goto Quit; } - /* Now insert the new client port into the object manager*/ - Status = ObInsertObject(ClientPortObject, 0, FLT_PORT_ALL_ACCESS, 1, 0, (PHANDLE)&PortHandle); + /* Now insert the new client port into the object manager */ + Status = ObInsertObject(ClientPortObject, NULL, FLT_PORT_ALL_ACCESS, 1, NULL, (PHANDLE)&PortHandle); if (!NT_SUCCESS(Status)) { + /* ObInsertObject() failed and already dereferenced ClientPortObject */ + ClientPortObject = NULL; goto Quit; }

1 0

[reactos] 01/01: [GITPOD] change extract directory to automatically extract to RosBE, and set tar to verbose mode
by Lucas Puntillo 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23249e13740ea83a4358… commit a23249e13740ea83a43586d5ca11ca5fd753620e Author: Lucas Puntillo <62703475+puntillol59(a)users.noreply.github.com> AuthorDate: Mon May 17 10:13:10 2021 -0400 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Dec 28 02:14:47 2021 +0300 [GITPOD] change extract directory to automatically extract to RosBE, and set tar to verbose mode change extract directory to automatically extract to RosBE, and set tar to verbose mode shorting the waiting time for the user and have verbose mode activated to show if there were any issues with the file itself. therefore helping the user and developer. --- .gitpod.Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 1fda5743294..d1dee8961b3 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -14,8 +14,7 @@ RUN sudo apt-get -q update && \ sudo rm -rf /var/lib/apt/lists/* RUN wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz && \ - sudo tar -xzf RosBEBinFull.tar.gz -C /usr/local && \ - sudo mv /usr/local/RosBEBinFull /usr/local/RosBE && \ + sudo tar -xzvf RosBEBinFull.tar.gz -C /usr/local --one-top-level=RosBE --strip-components 1 && \ rm -f RosBEBinFull.tar.gz RUN echo 'export PATH=/usr/local/RosBE/i386/bin:$PATH' >> /home/gitpod/.profile

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Remove add_definitions(/D__arm__) (#3710)
by Serge Gautherie 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665dac03b86ce0f7d7e9a… commit 665dac03b86ce0f7d7e9aa062fee5a3d08099682 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Dec 28 00:12:25 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 02:12:25 2021 +0300 [CMAKE] msvc.cmake: Remove add_definitions(/D__arm__) (#3710) --- sdk/cmake/msvc.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 5645f83dc31..77de6955619 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -363,7 +363,6 @@ if(ARCH STREQUAL "amd64") add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) elseif(ARCH STREQUAL "arm") - add_definitions(/D__arm__) set(SPEC2DEF_ARCH arm) elseif(ARCH STREQUAL "arm64") add_definitions(/D__arm64__)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs