Ros-diffs September 2021

ros-diffs@reactos.org

25 participants
144 discussions

[reactos] 03/03: [IMAGESOFT] Reorganize the bitmap resource IDs.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ae7c52f94850e1fb3c4… commit 00ae7c52f94850e1fb3c48130b30747545f8d68b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 26 02:43:00 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 26 02:43:02 2021 +0200 [IMAGESOFT] Reorganize the bitmap resource IDs. - Moving the IDB_* with their corresponding TBICON_* defines. - Reordering the BITMAP resources in the same order the defines are defined. - Fixing values for IDS_READY and IDS_TOOLBAR_TEXT. --- .../rosapps/applications/imagesoft/imagesoft.rc | 86 ++++++++-------- modules/rosapps/applications/imagesoft/mainwnd.c | 2 +- modules/rosapps/applications/imagesoft/resource.h | 110 +++++++++++---------- 3 files changed, 102 insertions(+), 96 deletions(-) diff --git a/modules/rosapps/applications/imagesoft/imagesoft.rc b/modules/rosapps/applications/imagesoft/imagesoft.rc index c1b7c8d9ef0..24a1fd72da5 100644 --- a/modules/rosapps/applications/imagesoft/imagesoft.rc +++ b/modules/rosapps/applications/imagesoft/imagesoft.rc @@ -13,60 +13,60 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_IMAGESOFTICON ICON "res/imagesoft.ico" /* main toolbar icons */ -IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" -IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" -IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" -IDB_MAINREDOICON BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" -IDB_MAINUNDOICON BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" -IDB_MAINNEWICON BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" -IDB_MAINOPENICON BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" -IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" -IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" -IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" +IDB_MAINNEW BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" +IDB_MAINOPEN BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" +IDB_MAINSAVE BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" +IDB_MAINPRINT BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" +IDB_MAINPRINTPRE BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" +IDB_MAINCUT BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" +IDB_MAINCOPY BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" +IDB_MAINPASTE BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" +IDB_MAINUNDO BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" +IDB_MAINREDO BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" /* text toolbar icons */ -IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" -IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" -IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/text/TextUnderlineIcon.bmp" -IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/text/TextAlignLeftIcon.bmp" -IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/text/TextAlignCenterIcon.bmp" -IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/text/TextAlignRightIcon.bmp" +IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" +IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" +IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/text/TextUnderlineIcon.bmp" +IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/text/TextAlignLeftIcon.bmp" +IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/text/TextAlignCenterIcon.bmp" +IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/text/TextAlignRightIcon.bmp" /* tools window icons */ -IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" -IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" -IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" -IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" -IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" -IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" -IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" -IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" -IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" -IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" -IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" -IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" -IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" -IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" -IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" -IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" -IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" -IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" -IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" -IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" +IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" +IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" +IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" +IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" +IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" +IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" +IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" +IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" +IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" +IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" +IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" +IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" +IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" +IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" +IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" +IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" +IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" +IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" +IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" +IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" /* history window icons */ -IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" -IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" -IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" +IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" +IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" +IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" IDB_HISTFORWARD BITMAP DISCARDABLE "res/icons/hist/HistForward.bmp" IDB_HISTDELETE BITMAP DISCARDABLE "res/icons/hist/HistDelete.bmp" /* colors window icons */ -IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" -IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" +IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" +IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" /* cursors */ -IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" -IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" +IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" +IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" #include "rsrc.rc" diff --git a/modules/rosapps/applications/imagesoft/mainwnd.c b/modules/rosapps/applications/imagesoft/mainwnd.c index b3373af9cf3..86b0b3f10cf 100644 --- a/modules/rosapps/applications/imagesoft/mainwnd.c +++ b/modules/rosapps/applications/imagesoft/mainwnd.c @@ -130,7 +130,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, { Buttons = StdButtons; NumButtons = ARRAYSIZE(StdButtons); - StartImageRes = IDB_MAINNEWICON; + StartImageRes = IDB_MAINNEW; NumImages = 10; break; } diff --git a/modules/rosapps/applications/imagesoft/resource.h b/modules/rosapps/applications/imagesoft/resource.h index 43baef251f9..e18fe1f28a3 100644 --- a/modules/rosapps/applications/imagesoft/resource.h +++ b/modules/rosapps/applications/imagesoft/resource.h @@ -17,6 +17,7 @@ #define IDR_POPUP 103 /* COMMANDS */ + /* main */ #define ID_NEW 2000 #define ID_OPEN 2001 @@ -129,59 +130,10 @@ #define IDS_HINT_SYS_CLOSE 21006 -/* Toolbar button bitmaps. +/* TOOLBAR BUTTON BITMAPS * These must be numbered consecutively * See loop in InitImageList (misc.c) */ -#define IDB_MAINNEWICON 10000 -#define IDB_MAINOPENICON 10001 -#define IDB_MAINSAVEICON 10002 -#define IDB_MAINPRINTICON 10003 -#define IDB_MAINPRINTPREICON 10004 -#define IDB_MAINCUTICON 10005 -#define IDB_MAINCOPYICON 10006 -#define IDB_MAINPASTEICON 10007 -#define IDB_MAINUNDOICON 10008 -#define IDB_MAINREDOICON 10009 - -#define IDB_TEXTBOLD 10020 -#define IDB_TEXTITALIC 10021 -#define IDB_TEXTULINE 10022 -#define IDB_TEXTLEFT 10023 -#define IDB_TEXTCENTER 10024 -#define IDB_TEXTRIGHT 10025 - -#define IDB_TOOLSRECTSEL 10030 -#define IDB_TOOLSMOVESEL 10031 -#define IDB_TOOLSLASOO 10032 -#define IDB_TOOLSMOVE 10033 -#define IDB_TOOLSECLIPSESEL 10034 -#define IDB_TOOLSZOOM 10035 -#define IDB_TOOLSMAGICWAND 10036 -#define IDB_TOOLSTEXT 10037 -#define IDB_TOOLSPAINTBRUSH 10038 -#define IDB_TOOLSERASER 10039 -#define IDB_TOOLSPENCIL 10040 -#define IDB_TOOLSCOLORPICKER 10041 -#define IDB_TOOLSCLONESTAMP 10042 -#define IDB_TOOLSRECOLORING 10043 -#define IDB_TOOLSPAINTBUCKET 10044 -#define IDB_TOOLSLINE 10045 -#define IDB_TOOLSRECTANGLE 10046 -#define IDB_TOOLSROUNDRECT 10047 -#define IDB_TOOLSECLIPSE 10048 -#define IDB_TOOLSFREEFORM 10049 - -#define IDB_HISTBACK 10060 -#define IDB_HISTUNDO 10061 -#define IDB_HISTREDO 10062 -#define IDB_HISTFORWARD 10063 -#define IDB_HISTDELETE 10064 - -#define IDB_COLORSMORE 10080 -#define IDB_COLORSLESS 10081 - -/* TOOLBAR BITMAPS */ /* standard */ #define TBICON_NEW 0 @@ -194,6 +146,19 @@ #define TBICON_PASTE 7 #define TBICON_UNDO 8 #define TBICON_REDO 9 + +#define IDB_MAINNEW 10000 +#define IDB_MAINOPEN 10001 +#define IDB_MAINSAVE 10002 +#define IDB_MAINPRINT 10003 +#define IDB_MAINPRINTPRE 10004 +#define IDB_MAINCUT 10005 +#define IDB_MAINCOPY 10006 +#define IDB_MAINPASTE 10007 +#define IDB_MAINUNDO 10008 +#define IDB_MAINREDO 10009 + + /* text */ #define TBICON_BOLD 0 #define TBICON_ITALIC 1 @@ -201,6 +166,15 @@ #define TBICON_TXTLEFT 3 #define TBICON_TXTCENTER 4 #define TBICON_TXTRIGHT 5 + +#define IDB_TEXTBOLD 10020 +#define IDB_TEXTITALIC 10021 +#define IDB_TEXTULINE 10022 +#define IDB_TEXTLEFT 10023 +#define IDB_TEXTCENTER 10024 +#define IDB_TEXTRIGHT 10025 + + /* tools */ #define TBICON_RECTSEL 0 #define TBICON_MOVESEL 1 @@ -222,6 +196,29 @@ #define TBICON_ROUNDRECT 17 #define TBICON_ECLIPSE 18 #define TBICON_FREEFORM 19 + +#define IDB_TOOLSRECTSEL 10030 +#define IDB_TOOLSMOVESEL 10031 +#define IDB_TOOLSLASOO 10032 +#define IDB_TOOLSMOVE 10033 +#define IDB_TOOLSECLIPSESEL 10034 +#define IDB_TOOLSZOOM 10035 +#define IDB_TOOLSMAGICWAND 10036 +#define IDB_TOOLSTEXT 10037 +#define IDB_TOOLSPAINTBRUSH 10038 +#define IDB_TOOLSERASER 10039 +#define IDB_TOOLSPENCIL 10040 +#define IDB_TOOLSCOLORPICKER 10041 +#define IDB_TOOLSCLONESTAMP 10042 +#define IDB_TOOLSRECOLORING 10043 +#define IDB_TOOLSPAINTBUCKET 10044 +#define IDB_TOOLSLINE 10045 +#define IDB_TOOLSRECTANGLE 10046 +#define IDB_TOOLSROUNDRECT 10047 +#define IDB_TOOLSECLIPSE 10048 +#define IDB_TOOLSFREEFORM 10049 + + /* history */ #define TBICON_BACKSM 0 #define TBICON_UNDOSM 1 @@ -229,6 +226,15 @@ #define TBICON_FORWARDSM 3 #define TBICON_DELETESM 4 +#define IDB_HISTBACK 10060 +#define IDB_HISTUNDO 10061 +#define IDB_HISTREDO 10062 +#define IDB_HISTFORWARD 10063 +#define IDB_HISTDELETE 10064 + +#define IDB_COLORSMORE 10080 +#define IDB_COLORSLESS 10081 + /* tooltips */ #define IDS_TOOLTIP_NEW 6000 @@ -290,8 +296,8 @@ #define IDS_APPNAME 4202 #define IDS_VERSION 4203 #define IDS_LICENSE 4204 -#define IDS_READY 42050 +#define IDS_READY 4205 #define IDS_TOOLBAR_STANDARD 4206 #define IDS_TOOLBAR_TEST 4207 -#define IDS_TOOLBAR_TEXT 4205 +#define IDS_TOOLBAR_TEXT 4208 #define IDS_IMAGE_NAME 4209

2 years, 11 months

[reactos] 02/03: [IMAGESOFT] Use ARRAYSIZE / un-hardcode some sizeof(TYPE) where applicable.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=516c8829eaa28553aac39… commit 516c8829eaa28553aac397017becaa701521c99b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 26 02:38:37 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 26 02:38:37 2021 +0200 [IMAGESOFT] Use ARRAYSIZE / un-hardcode some sizeof(TYPE) where applicable. --- modules/rosapps/applications/imagesoft/about.c | 2 +- modules/rosapps/applications/imagesoft/adjust.c | 8 ++++---- modules/rosapps/applications/imagesoft/brightness.c | 2 +- modules/rosapps/applications/imagesoft/contrast.c | 2 +- modules/rosapps/applications/imagesoft/floatwindow.c | 7 +++---- modules/rosapps/applications/imagesoft/font.c | 2 +- modules/rosapps/applications/imagesoft/imagesoft.c | 2 +- modules/rosapps/applications/imagesoft/imgedwnd.c | 10 +++++----- modules/rosapps/applications/imagesoft/mainwnd.c | 16 ++++++++-------- modules/rosapps/applications/imagesoft/opensave.c | 2 +- modules/rosapps/applications/imagesoft/tooldock.c | 2 +- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/modules/rosapps/applications/imagesoft/about.c b/modules/rosapps/applications/imagesoft/about.c index a53af44d64e..32ba6a8a6de 100644 --- a/modules/rosapps/applications/imagesoft/about.c +++ b/modules/rosapps/applications/imagesoft/about.c @@ -32,7 +32,7 @@ AboutDialogProc(HWND hDlg, LoadString(hInstance, IDS_LICENSE, strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + ARRAYSIZE(strLicense)); SetWindowText(hLicenseEditWnd, strLicense); diff --git a/modules/rosapps/applications/imagesoft/adjust.c b/modules/rosapps/applications/imagesoft/adjust.c index 90ca2bf3f8a..f3ba1986e82 100644 --- a/modules/rosapps/applications/imagesoft/adjust.c +++ b/modules/rosapps/applications/imagesoft/adjust.c @@ -15,7 +15,7 @@ DisplayBlackAndWhite(HWND hwnd, RECT rc; GetObject(hBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ @@ -112,7 +112,7 @@ DisplayInvertedColors(HWND hwnd, RECT rc; GetObject(hBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ @@ -206,7 +206,7 @@ DisplayBlur(HWND hwnd, RECT rc; GetObject(hBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ @@ -367,7 +367,7 @@ DisplaySharpness(HWND hwnd, RECT rc; GetObject(hBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ diff --git a/modules/rosapps/applications/imagesoft/brightness.c b/modules/rosapps/applications/imagesoft/brightness.c index 265237ea446..d596e291189 100644 --- a/modules/rosapps/applications/imagesoft/brightness.c +++ b/modules/rosapps/applications/imagesoft/brightness.c @@ -21,7 +21,7 @@ AdjustBrightness(HBITMAP hOrigBitmap, RECT rc; GetObject(hNewBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ diff --git a/modules/rosapps/applications/imagesoft/contrast.c b/modules/rosapps/applications/imagesoft/contrast.c index 7a885358d99..defb31a68fa 100644 --- a/modules/rosapps/applications/imagesoft/contrast.c +++ b/modules/rosapps/applications/imagesoft/contrast.c @@ -21,7 +21,7 @@ AdjustContrast(HBITMAP hOrigBitmap, RECT rc; GetObject(hNewBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); /* Bitmap header */ diff --git a/modules/rosapps/applications/imagesoft/floatwindow.c b/modules/rosapps/applications/imagesoft/floatwindow.c index da831e1959a..71eceb6c7f5 100644 --- a/modules/rosapps/applications/imagesoft/floatwindow.c +++ b/modules/rosapps/applications/imagesoft/floatwindow.c @@ -58,8 +58,7 @@ FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) HIMAGELIST hImageList; UINT NumButtons; - NumButtons = sizeof(ToolsButtons) / sizeof(ToolsButtons[0]); - + NumButtons = ARRAYSIZE(ToolsButtons); hTb = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, @@ -293,7 +292,7 @@ FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) if (hList == NULL) return FALSE; - NumButtons = sizeof(HistoryButtons) / sizeof(HistoryButtons[0]); + NumButtons = ARRAYSIZE(HistoryButtons); hButtons = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, @@ -603,7 +602,7 @@ InitFloatWndClass(VOID) { WNDCLASSEX wc = {0}; - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = FloatToolbarWndProc; wc.hInstance = hInstance; diff --git a/modules/rosapps/applications/imagesoft/font.c b/modules/rosapps/applications/imagesoft/font.c index e8540f65310..62d07e6879e 100644 --- a/modules/rosapps/applications/imagesoft/font.c +++ b/modules/rosapps/applications/imagesoft/font.c @@ -16,7 +16,7 @@ EnumFontSizes(ENUMLOGFONTEX *lpelfe, if (fTrueType) { - for (i = 0; i < (sizeof(ttsizes) / sizeof(ttsizes[0])); i++) + for (i = 0; i < ARRAYSIZE(ttsizes); i++) { wsprintf(ach, _T("%d"), ttsizes[i]); diff --git a/modules/rosapps/applications/imagesoft/imagesoft.c b/modules/rosapps/applications/imagesoft/imagesoft.c index e673a3405d2..c54300763e7 100644 --- a/modules/rosapps/applications/imagesoft/imagesoft.c +++ b/modules/rosapps/applications/imagesoft/imagesoft.c @@ -20,7 +20,7 @@ _tWinMain(HINSTANCE hThisInstance, hInstance = hThisInstance; ProcessHeap = GetProcessHeap(); - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwSize = sizeof(icex); icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; InitCommonControlsEx(&icex); diff --git a/modules/rosapps/applications/imagesoft/imgedwnd.c b/modules/rosapps/applications/imagesoft/imgedwnd.c index c9342080461..846e50f294e 100644 --- a/modules/rosapps/applications/imagesoft/imgedwnd.c +++ b/modules/rosapps/applications/imagesoft/imgedwnd.c @@ -65,14 +65,14 @@ LoadDIBImage(PEDIT_WND_INFO Info) bSuccess = ReadFile(hFile, &bmfh, - sizeof(BITMAPFILEHEADER), + sizeof(bmfh), &BytesRead, NULL); - if (bSuccess && (BytesRead == sizeof(BITMAPFILEHEADER)) + if (bSuccess && (BytesRead == sizeof(bmfh)) && (bmfh.bfType == *(WORD *)"BM")) { - DWORD InfoSize = bmfh.bfOffBits - sizeof(BITMAPFILEHEADER); + DWORD InfoSize = bmfh.bfOffBits - sizeof(bmfh); Info->pbmi = HeapAlloc(ProcessHeap, 0, @@ -102,7 +102,7 @@ LoadDIBImage(PEDIT_WND_INFO Info) NULL); GetObject(Info->hBitmap, - sizeof(BITMAP), + sizeof(bitmap), &bitmap); Info->Width = bitmap.bmWidth; @@ -514,7 +514,7 @@ InitImageEditWindowImpl(VOID) { WNDCLASSEX wc = {0}; - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ImageEditWndProc; wc.hInstance = hInstance; diff --git a/modules/rosapps/applications/imagesoft/mainwnd.c b/modules/rosapps/applications/imagesoft/mainwnd.c index 551b53ab692..b3373af9cf3 100644 --- a/modules/rosapps/applications/imagesoft/mainwnd.c +++ b/modules/rosapps/applications/imagesoft/mainwnd.c @@ -129,7 +129,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, case ID_TOOLBAR_STANDARD: { Buttons = StdButtons; - NumButtons = sizeof(StdButtons) / sizeof(StdButtons[0]); + NumButtons = ARRAYSIZE(StdButtons); StartImageRes = IDB_MAINNEWICON; NumImages = 10; break; @@ -138,7 +138,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, case ID_TOOLBAR_TEXT: { Buttons = TextButtons; - NumButtons = sizeof(TextButtons) / sizeof(TextButtons[0]); + NumButtons = ARRAYSIZE(TextButtons); StartImageRes = IDB_TEXTBOLD; NumImages = 6; break; @@ -493,7 +493,7 @@ MainWndMoveFloatingWindows(PMAIN_WND_INFO Info, CopyMemory(wndOldPos, &wndNewPos, - sizeof(RECT)); + sizeof(wndOldPos)); } } @@ -665,7 +665,7 @@ CreateToolbars(PMAIN_WND_INFO Info) { UINT i; - for (i = 0; i < sizeof(MainDockBars) / sizeof(MainDockBars[0]); i++) + for (i = 0; i < ARRAYSIZE(MainDockBars); i++) { /* FIXME - lookup whether to display the toolbar */ TbdAddToolbar(&Info->ToolDocks, @@ -774,7 +774,7 @@ InitMainWnd(PMAIN_WND_INFO Info) if (Info->hStatus != NULL) SendMessage(Info->hStatus, SB_SETPARTS, - sizeof(statwidths)/sizeof(int), + ARRAYSIZE(statwidths), (LPARAM)statwidths); /* create the MDI client window */ @@ -1170,13 +1170,13 @@ MainWndProc(HWND hwnd, if (!MainWndMenuHint(Info, LOWORD(wParam), MainMenuHintTable, - sizeof(MainMenuHintTable) / sizeof(MainMenuHintTable[0]), + ARRAYSIZE(MainMenuHintTable), IDS_HINT_BLANK)) { MainWndMenuHint(Info, LOWORD(wParam), SystemMenuHintTable, - sizeof(SystemMenuHintTable) / sizeof(SystemMenuHintTable[0]), + ARRAYSIZE(SystemMenuHintTable), IDS_HINT_BLANK); } } @@ -1428,7 +1428,7 @@ InitMainWindowImpl(VOID) { WNDCLASSEX wc = {0}; - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(wc); wc.lpfnWndProc = MainWndProc; wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, diff --git a/modules/rosapps/applications/imagesoft/opensave.c b/modules/rosapps/applications/imagesoft/opensave.c index 9fccbb8b64b..1d668bfd894 100644 --- a/modules/rosapps/applications/imagesoft/opensave.c +++ b/modules/rosapps/applications/imagesoft/opensave.c @@ -8,7 +8,7 @@ static OPENFILENAME ofn; VOID FileInitialize(HWND hwnd) { ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); + ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwnd; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; diff --git a/modules/rosapps/applications/imagesoft/tooldock.c b/modules/rosapps/applications/imagesoft/tooldock.c index 84c513b27a4..a4716b45866 100644 --- a/modules/rosapps/applications/imagesoft/tooldock.c +++ b/modules/rosapps/applications/imagesoft/tooldock.c @@ -1117,7 +1117,7 @@ TbdInitImpl(VOID) { WNDCLASSEX wc = {0}; - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ToolDockWndProc; wc.cbWndExtra = TD_EXTRA_BYTES;

2 years, 11 months

[reactos] 01/03: [IMAGESOFT] Commit db416e39 made toolbar imagelists creating failing because we overcounted the number of toolbar button bitmaps.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67fd29cae04f260273244… commit 67fd29cae04f2602732440ddd8cabcb4a425f3d1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 26 02:26:42 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 26 02:26:42 2021 +0200 [IMAGESOFT] Commit db416e39 made toolbar imagelists creating failing because we overcounted the number of toolbar button bitmaps. Indeed the count was based on the number of elements in TBBUTTON arrays; however for some of the toolbars, extra entries corresponding to separators are present, and thus the resulting number of elements is always larger than the number of actual buttons for which an image is associated. Passing this (larger) count to the InitImageList() function therefore made image insertion fail after a certain point. Now we pass an exact number of *images* instead. --- modules/rosapps/applications/imagesoft/floatwindow.c | 10 ++++------ modules/rosapps/applications/imagesoft/mainwnd.c | 6 ++++-- modules/rosapps/applications/imagesoft/misc.c | 8 +++----- modules/rosapps/applications/imagesoft/misc.h | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/rosapps/applications/imagesoft/floatwindow.c b/modules/rosapps/applications/imagesoft/floatwindow.c index 28b393747c1..da831e1959a 100644 --- a/modules/rosapps/applications/imagesoft/floatwindow.c +++ b/modules/rosapps/applications/imagesoft/floatwindow.c @@ -56,7 +56,7 @@ FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) { HWND hTb; HIMAGELIST hImageList; - INT NumButtons; + UINT NumButtons; NumButtons = sizeof(ToolsButtons) / sizeof(ToolsButtons[0]); @@ -86,8 +86,7 @@ FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) 0, (LPARAM)MAKELONG(16, 16)); - hImageList = InitImageList(NumButtons, - IDB_TOOLSRECTSEL); + hImageList = InitImageList(IDB_TOOLSRECTSEL, NumButtons - 1); // -1 because of the last separator. ImageList_Destroy((HIMAGELIST)SendMessage(hTb, TB_SETIMAGELIST, @@ -280,7 +279,7 @@ FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) HWND hList; HWND hButtons; HIMAGELIST hImageList; - INT NumButtons; + UINT NumButtons; hList = CreateWindowEx(0, WC_LISTBOX, @@ -316,8 +315,7 @@ FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) 0, (LPARAM)MAKELONG(10, 10)); - hImageList = InitImageList(NumButtons, - IDB_HISTBACK); + hImageList = InitImageList(IDB_HISTBACK, NumButtons); ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, TB_SETIMAGELIST, diff --git a/modules/rosapps/applications/imagesoft/mainwnd.c b/modules/rosapps/applications/imagesoft/mainwnd.c index 07597022998..551b53ab692 100644 --- a/modules/rosapps/applications/imagesoft/mainwnd.c +++ b/modules/rosapps/applications/imagesoft/mainwnd.c @@ -119,6 +119,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, const TBBUTTON *Buttons = NULL; UINT NumButtons = 0; UINT StartImageRes = 0; + UINT NumImages = 0; HWND hWndClient = NULL; UNREFERENCED_PARAMETER(Context); @@ -130,6 +131,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, Buttons = StdButtons; NumButtons = sizeof(StdButtons) / sizeof(StdButtons[0]); StartImageRes = IDB_MAINNEWICON; + NumImages = 10; break; } @@ -138,6 +140,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, Buttons = TextButtons; NumButtons = sizeof(TextButtons) / sizeof(TextButtons[0]); StartImageRes = IDB_TEXTBOLD; + NumImages = 6; break; } @@ -194,8 +197,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, 0, (LPARAM)MAKELONG(TB_BMP_WIDTH, TB_BMP_HEIGHT)); - hImageList = InitImageList(NumButtons, - StartImageRes); + hImageList = InitImageList(StartImageRes, NumImages); ImageList_Destroy((HIMAGELIST)SendMessage(hWndClient, TB_SETIMAGELIST, diff --git a/modules/rosapps/applications/imagesoft/misc.c b/modules/rosapps/applications/imagesoft/misc.c index 4b72006152f..34a4793cb93 100644 --- a/modules/rosapps/applications/imagesoft/misc.c +++ b/modules/rosapps/applications/imagesoft/misc.c @@ -372,7 +372,8 @@ ToolbarInsertSpaceForControl(HWND hWndToolbar, HIMAGELIST -InitImageList(UINT NumImages, UINT StartResource) +InitImageList(UINT StartResource, + UINT NumImages) { UINT EndResource = StartResource + NumImages - 1; HBITMAP hBitmap; @@ -390,7 +391,7 @@ InitImageList(UINT NumImages, UINT StartResource) return NULL; /* Add all icons to the image list */ - for (i = StartResource; i <= EndResource; i++) + for (i = StartResource; i <= EndResource && Ret != -1; i++) { hBitmap = LoadImage(hInstance, MAKEINTRESOURCE(i), @@ -409,9 +410,6 @@ InitImageList(UINT NumImages, UINT StartResource) RGB(255, 255, 254)); DeleteObject(hBitmap); - - if (Ret == -1) - break; } if (Ret == -1) diff --git a/modules/rosapps/applications/imagesoft/misc.h b/modules/rosapps/applications/imagesoft/misc.h index 05d48307963..7a7d6cf15d8 100644 --- a/modules/rosapps/applications/imagesoft/misc.h +++ b/modules/rosapps/applications/imagesoft/misc.h @@ -40,5 +40,5 @@ BOOL ToolbarInsertSpaceForControl(HWND hWndToolbar, INT iCmd, BOOL HideVertical); -HIMAGELIST InitImageList(UINT NumButtons, - UINT StartResource); +HIMAGELIST InitImageList(UINT StartResource, + UINT NumImages);

2 years, 11 months

[reactos] 01/01: [Win32SS|GDI] Implement seldom used API and update types for local DC's.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=970344bd16df0e21aa6b9… commit 970344bd16df0e21aa6b92fa6c235dae6143fe1c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sat Sep 25 11:57:26 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sat Sep 25 11:57:26 2021 -0500 [Win32SS|GDI] Implement seldom used API and update types for local DC's. Two working in house application require these API. Known as FolCOL and Reach. --- win32ss/gdi/eng/stubs.c | 20 +++++-- win32ss/gdi/gdi32/objects/bitmap.c | 111 +++++++++++-------------------------- win32ss/gdi/gdi32/objects/brush.c | 28 ++++++---- win32ss/gdi/gdi32/objects/icm.c | 29 +++++++++- win32ss/gdi/ntgdi/brush.cpp | 16 +++++- win32ss/gdi/ntgdi/gdiobj.c | 34 ++++++++++++ win32ss/gdi/ntgdi/gdiobj.h | 1 + win32ss/include/ntgdihdl.h | 9 +++ 8 files changed, 150 insertions(+), 98 deletions(-) diff --git a/win32ss/gdi/eng/stubs.c b/win32ss/gdi/eng/stubs.c index 8a91c86ff5f..5cc878e0d80 100644 --- a/win32ss/gdi/eng/stubs.c +++ b/win32ss/gdi/eng/stubs.c @@ -784,7 +784,7 @@ NtGdiCheckBitmapBits( } /* - * @unimplemented + * @implemented */ HBITMAP APIENTRY @@ -792,7 +792,13 @@ NtGdiClearBitmapAttributes( IN HBITMAP hbm, IN DWORD dwFlags) { - UNIMPLEMENTED; + if ( dwFlags & SC_BB_STOCKOBJ ) + { + if (GDIOBJ_ConvertFromStockObj((HGDIOBJ*)&hbm)) + { + return hbm; + } + } return NULL; } @@ -1406,7 +1412,7 @@ NtGdiMonoBitmap( } /* - * @unimplemented + * @implemented */ HBITMAP APIENTRY @@ -1414,7 +1420,13 @@ NtGdiSetBitmapAttributes( IN HBITMAP hbm, IN DWORD dwFlags) { - UNIMPLEMENTED; + if ( dwFlags & SC_BB_STOCKOBJ ) + { + if (GDIOBJ_ConvertToStockObj((HGDIOBJ*)&hbm)) + { + return hbm; + } + } return NULL; } diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index 91e8a0be9ee..f290b546617 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -812,52 +812,23 @@ StretchDIBits( DPRINT("StretchDIBits %p : %p : %u\n", lpBits, lpBitsInfo, iUsage); #if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_StretchBlt( hdc, - XDest, - YDest, - nDestWidth, - nDestHeight, - XSrc, - YSrc, - nSrcWidth, - nSrcHeight, - lpBits, - lpBitsInfo, - iUsage, - dwRop); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_StretchBlt(hdc, - XDest, - YDest, - nDestWidth, - nDestHeight, - XSrc, - YSrc, - nSrcWidth, - nSrcHeight, - lpBits, - lpBitsInfo, - iUsage, - dwRop); - } - return 0; - } - } + HANDLE_METADC( int, + StretchDIBits, + 0, + hdc, + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + lpBits, + lpBitsInfo, + iUsage, + dwRop ); #endif - if ( GdiConvertAndCheckDC(hdc) == NULL ) return 0; pConvertedInfo = ConvertBitmapInfo(lpBitsInfo, iUsage, &ConvertedInfoSize, @@ -921,61 +892,45 @@ StretchDIBits( } /* - * @unimplemented + * @implemented */ DWORD WINAPI GetBitmapAttributes(HBITMAP hbm) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if ( GDI_HANDLE_IS_STOCKOBJ(hbm) ) + { + return SC_BB_STOCKOBJ; + } return 0; } /* - * @unimplemented + * @implemented */ HBITMAP WINAPI SetBitmapAttributes(HBITMAP hbm, DWORD dwFlags) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( dwFlags & ~SC_BB_STOCKOBJ ) + { + return NULL; + } + return NtGdiSetBitmapAttributes( hbm, dwFlags ); } /* - * @unimplemented + * @implemented */ HBITMAP WINAPI ClearBitmapAttributes(HBITMAP hbm, DWORD dwFlags) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( dwFlags & ~SC_BB_STOCKOBJ ) + { + return NULL; + } + return NtGdiClearBitmapAttributes( hbm, dwFlags );; } -/* - * @unimplemented - * - */ -HBITMAP -WINAPI -GdiConvertBitmapV5( - HBITMAP in_format_BitMap, - HBITMAP src_BitMap, - INT bpp, - INT unuse) -{ - /* FIXME guessing the prototypes */ - - /* - * it have create a new bitmap with desired in format, - * then convert it src_bitmap to new format - * and return it as HBITMAP - */ - - return FALSE; -} diff --git a/win32ss/gdi/gdi32/objects/brush.c b/win32ss/gdi/gdi32/objects/brush.c index 6f73d62a8d4..9be9dc980f8 100644 --- a/win32ss/gdi/gdi32/objects/brush.c +++ b/win32ss/gdi/gdi32/objects/brush.c @@ -340,39 +340,45 @@ SetBrushOrgEx(HDC hdc, } /* - * @unimplemented + * @implemented */ DWORD WINAPI GetBrushAttributes(HBRUSH hbr) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if ( GDI_HANDLE_IS_STOCKOBJ(hbr) ) + { + return SC_BB_STOCKOBJ; + } return 0; } /* - * @unimplemented + * @implemented */ HBRUSH WINAPI SetBrushAttributes(HBRUSH hbm, DWORD dwFlags) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( dwFlags & ~SC_BB_STOCKOBJ ) + { + return NULL; + } + return NtGdiSetBrushAttributes(hbm, dwFlags); } /* - * @unimplemented + * @implemented */ HBRUSH WINAPI ClearBrushAttributes(HBRUSH hbm, DWORD dwFlags) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( dwFlags & ~SC_BB_STOCKOBJ ) + { + return NULL; + } + return NtGdiClearBrushAttributes(hbm, dwFlags); } /* diff --git a/win32ss/gdi/gdi32/objects/icm.c b/win32ss/gdi/gdi32/objects/icm.c index 520463a491a..97dc3424445 100644 --- a/win32ss/gdi/gdi32/objects/icm.c +++ b/win32ss/gdi/gdi32/objects/icm.c @@ -106,12 +106,12 @@ SetColorSpace( { HCOLORSPACE rhCS = GetColorSpace(hDC); - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC) + if (GDI_HANDLE_GET_TYPE(hDC) == GDILoObjType_LO_DC_TYPE) { if (NtGdiSetColorSpace(hDC, hCS)) return rhCS; } #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_METADC) + if (GDI_HANDLE_GET_TYPE(hDC) != GDILoObjType_LO_METADC16_TYPE) { PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) @@ -119,7 +119,7 @@ SetColorSpace( SetLastError(ERROR_INVALID_HANDLE); return NULL; } - if (pLDC->iType == LDC_EMFLDC) + if (pLDC->iType == LDC_EMFLDC && !EMFDC_SetColorSpace( pLDC, hCS )) { return NULL; } @@ -327,3 +327,26 @@ SetICMMode( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/* + * @unimplemented + * + */ +HBITMAP +WINAPI +GdiConvertBitmapV5( + HBITMAP in_format_BitMap, + HBITMAP src_BitMap, + INT bpp, + INT unuse) +{ + /* FIXME guessing the prototypes */ + + /* + * it have create a new bitmap with desired in format, + * then convert it src_bitmap to new format + * and return it as HBITMAP + */ + + return FALSE; +} diff --git a/win32ss/gdi/ntgdi/brush.cpp b/win32ss/gdi/ntgdi/brush.cpp index 41d13184b12..2c18e25b307 100644 --- a/win32ss/gdi/ntgdi/brush.cpp +++ b/win32ss/gdi/ntgdi/brush.cpp @@ -543,7 +543,13 @@ NtGdiSetBrushAttributes( _In_ HBRUSH hbr, _In_ DWORD dwFlags) { - FIXME("NtGdiSetBrushAttributes is unimplemented\n"); + if ( dwFlags & SC_BB_STOCKOBJ ) + { + if (GDIOBJ_ConvertToStockObj((HGDIOBJ*)&hbr)) + { + return hbr; + } + } return NULL; } @@ -554,7 +560,13 @@ NtGdiClearBrushAttributes( _In_ HBRUSH hbr, _In_ DWORD dwFlags) { - FIXME("NtGdiClearBrushAttributes is unimplemented\n"); + if ( dwFlags & SC_BB_STOCKOBJ ) + { + if (GDIOBJ_ConvertFromStockObj((HGDIOBJ*)&hbr)) + { + return hbr; + } + } return NULL; } diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index e92c070b469..7bd97e3fa6d 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -1484,6 +1484,40 @@ GDIOBJ_ConvertToStockObj(HGDIOBJ *phObj) return TRUE; } +BOOL +NTAPI +GDIOBJ_ConvertFromStockObj(HGDIOBJ *phObj) +{ + PENTRY pentry; + POBJ pobj; + + /* Reference the handle entry */ + pentry = ENTRY_ReferenceEntryByHandle(*phObj, 0); + if (!pentry) + { + DPRINT1("GDIOBJ: Requested handle 0x%p is not valid.\n", *phObj); + return FALSE; + } + + /* Update the entry */ + pentry->FullUnique &= ~GDI_ENTRY_STOCK_MASK; + pentry->ObjectOwner.ulObj = 0; + + /* Get the pointer to the BASEOBJECT */ + pobj = pentry->einfo.pobj; + + /* Calculate the new handle */ + pobj->hHmgr = (HGDIOBJ)((ULONG_PTR)pobj->hHmgr & ~GDI_HANDLE_STOCK_MASK); + + /* Return the new handle */ + *phObj = pobj->hHmgr; + + /* Dereference the handle */ + GDIOBJ_vDereferenceObject(pobj); + + return TRUE; +} + POBJ NTAPI GDIOBJ_AllocObjWithHandle(ULONG ObjectType, ULONG cjSize) { diff --git a/win32ss/gdi/ntgdi/gdiobj.h b/win32ss/gdi/ntgdi/gdiobj.h index f7b65594187..bd7c416a16c 100644 --- a/win32ss/gdi/ntgdi/gdiobj.h +++ b/win32ss/gdi/ntgdi/gdiobj.h @@ -195,6 +195,7 @@ GDIOBJ_pvGetObjectAttr( POBJ pobj); BOOL NTAPI GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); +BOOL NTAPI GDIOBJ_ConvertFromStockObj(HGDIOBJ *phObj); POBJ NTAPI GDIOBJ_AllocObjWithHandle(ULONG ObjectType, ULONG cjSize); PGDIOBJ NTAPI GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ObjectType); PVOID NTAPI GDI_MapHandleTable(PEPROCESS Process); diff --git a/win32ss/include/ntgdihdl.h b/win32ss/include/ntgdihdl.h index 1c0c230823b..36dc54ce8e7 100644 --- a/win32ss/include/ntgdihdl.h +++ b/win32ss/include/ntgdihdl.h @@ -174,16 +174,23 @@ #define LDC_INIT_PAGE 0x00000080 #define LDC_STARTPAGE 0x00000100 #define LDC_NEXTBAND 0x00000200 +#define LDC_FONTHASH 0x00001000 #define LDC_CLOCKWISE 0x00002000 +#define LDC_NEWFONT 0x00008000 #define LDC_KILL_DOCUMENT 0x00010000 #define LDC_META_PRINT 0x00020000 #define LDC_DIRECT 0x00040000 #define LDC_RESET_BANDING 0x00080000 +#define LDC_DOWNLOADFONTS 0x00100000 #define LDC_RESETDC 0x00200000 #define LDC_UFIMAP 0x00400000 #define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 +#define LDC_XPS_PASS 0x08000000 // Guessing, not sure. #define LDC_ATENDPAGE 0x10000000 +#define LDC_COLORPAGE 0x20000000 + +#define UFIHASHTABLESIZE 64 /* DC_ATTR Xform Flags */ #define METAFILE_TO_WORLD_IDENTITY 0x00000001 @@ -210,6 +217,8 @@ #define ATTR_RGN_VALID 0x00000010 #define ATTR_RGN_DIRTY 0x00000020 +/* Set/Clear Bitmap/Brush Stock Attribute */ +#define SC_BB_STOCKOBJ 1 /* TYPES *********************************************************************/

2 years, 11 months

[reactos] 01/01: [NTUSER] Fix UserSendKeyboardInput() KEYEVENTF_SCANCODE use case (CORE-17144)

by Arjav Garg

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a602bc355054c081e62e6… commit a602bc355054c081e62e6b0fd0fcbb96d48845ed Author: Arjav Garg <arjavgarg(a)gmail.com> AuthorDate: Sun Sep 5 02:04:38 2021 +0530 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 25 09:56:12 2021 -0400 [NTUSER] Fix UserSendKeyboardInput() KEYEVENTF_SCANCODE use case (CORE-17144) --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/keybd_event.c | 42 +++++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 ++ win32ss/user/ntuser/keyboard.c | 5 ++- 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 99d7b4d3168..bafd3571df5 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND SOURCE GetUserObjectInformation.c GetWindowPlacement.c InitializeLpkHooks.c + keybd_event.c LoadImage.c LookupIconIdFromDirectoryEx.c MessageStateAnalyzer.c diff --git a/modules/rostests/apitests/user32/keybd_event.c b/modules/rostests/apitests/user32/keybd_event.c new file mode 100644 index 00000000000..39475e883ae --- /dev/null +++ b/modules/rostests/apitests/user32/keybd_event.c @@ -0,0 +1,42 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for keyboard inputs with flags KEYEVENTF_EXTENDEDKEY and KEYEVENTF_SCANCODE + * COPYRIGHT: Copyright 2021 Arjav Garg <arjavgarg(a)gmail.com> + */ + +#include "precomp.h" + +static void testScancodeExtendedKey(BYTE wVk, BYTE scanCode) +{ + trace("wVK: %x\tScancode: %x\n", wVk, scanCode); + + keybd_event(0, scanCode, KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY, 0); + SHORT winKeyState = GetAsyncKeyState(wVk); + ok(winKeyState & 0x8000, "VK=%x should be detected as key down.\n", wVk); + + keybd_event(0, scanCode, KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); + winKeyState = GetAsyncKeyState(wVk); + ok(!(winKeyState & 0x8000), "VK=%x should be detected as key up.\n", wVk); +} + +/* https://docs.microsoft.com/en-us/windows/win32/inputdev/about-keyboard-inpu… */ +START_TEST(keybd_event) +{ + testScancodeExtendedKey(VK_RWIN, 0x5C); + testScancodeExtendedKey(VK_LWIN, 0x5B); + testScancodeExtendedKey(VK_RMENU, 0x38); + testScancodeExtendedKey(VK_RCONTROL, 0x1D); + testScancodeExtendedKey(VK_INSERT, 0x52); + testScancodeExtendedKey(VK_DELETE, 0x53); + testScancodeExtendedKey(VK_HOME, 0x47); + testScancodeExtendedKey(VK_END, 0x4f); + testScancodeExtendedKey(VK_PRIOR, 0x49); + testScancodeExtendedKey(VK_NEXT, 0x51); + testScancodeExtendedKey(VK_UP, 0x48); + testScancodeExtendedKey(VK_RIGHT, 0x4d); + testScancodeExtendedKey(VK_LEFT, 0x4b); + testScancodeExtendedKey(VK_DOWN, 0x50); + testScancodeExtendedKey(VK_DIVIDE, 0x35); + testScancodeExtendedKey(VK_RETURN, 0x1C); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 26325af0571..b372365501c 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -25,6 +25,7 @@ extern void func_GetSystemMetrics(void); extern void func_GetUserObjectInformation(void); extern void func_GetWindowPlacement(void); extern void func_InitializeLpkHooks(void); +extern void func_keybd_event(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); extern void func_MessageStateAnalyzer(void); @@ -76,6 +77,7 @@ const struct test winetest_testlist[] = { "GetUserObjectInformation", func_GetUserObjectInformation }, { "GetWindowPlacement", func_GetWindowPlacement }, { "InitializeLpkHooks", func_InitializeLpkHooks }, + { "keybd_event", func_keybd_event }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, { "MessageStateAnalyzer", func_MessageStateAnalyzer }, diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 61a30b6a0e9..08a7b6861c8 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -1020,8 +1020,11 @@ UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) } else { - wVk = pKbdInput->wVk & 0xFF; + wVk = pKbdInput->wVk; } + + /* Remove all virtual key flags (KBDEXT, KBDMULTIVK, KBDSPECIAL, KBDNUMPAD) */ + wVk &= 0xFF; } /* If time is given, use it */

2 years, 11 months

[reactos] 02/02: [NTOS:OB] Minor refactoring.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74513a75ab15608f2018f… commit 74513a75ab15608f2018f52661e84e8435b72b98 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 24 22:39:35 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 25 01:09:01 2021 +0200 [NTOS:OB] Minor refactoring. - NtQuerySymbolicLinkObject(): Use an intermediate variable for the object header. - Simplify code in ObpLookupEntryDirectory() by calling ObpReleaseLookupContextObject() instead. - Use TAG_OBJECT_TYPE instead of hardcoded tag values. --- ntoskrnl/ob/obdir.c | 16 ++++------------ ntoskrnl/ob/oblife.c | 4 ++-- ntoskrnl/ob/oblink.c | 15 ++++++++++----- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index cb7699ac840..3f3bc492c11 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -174,6 +174,7 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, PVOID FoundObject = NULL; PWSTR Buffer; POBJECT_DIRECTORY ShadowDirectory; + PAGED_CODE(); /* Check if we should search the shadow directory */ @@ -317,20 +318,11 @@ Quickie: } } - /* Check if we found an object already */ - if (Context->Object) - { - /* We already did a lookup, so remove this object's query reference */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); - HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObpDereferenceNameInfo(HeaderNameInfo); - - /* Also dereference the object itself */ - ObDereferenceObject(Context->Object); - } + /* Release any object previously looked up and replace it with the new one */ + ObpReleaseLookupContextObject(Context); + Context->Object = FoundObject; /* Return the object we found */ - Context->Object = FoundObject; return FoundObject; } diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index a01f5373bca..06c0d96e904 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -635,7 +635,7 @@ ObpAllocateObject(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, { /* Use default tag and non-paged pool */ PoolType = NonPagedPool; - Tag = 'TjbO'; + Tag = TAG_OBJECT_TYPE; } else { @@ -1159,7 +1159,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName, /* Set the hard-coded key and object count */ LocalObjectType->TotalNumberOfObjects = 1; - LocalObjectType->Key = 'TjbO'; + LocalObjectType->Key = TAG_OBJECT_TYPE; } else { diff --git a/ntoskrnl/ob/oblink.c b/ntoskrnl/ob/oblink.c index 7d03ba1bf96..47b813b802a 100644 --- a/ntoskrnl/ob/oblink.c +++ b/ntoskrnl/ob/oblink.c @@ -904,11 +904,13 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, OUT PUNICODE_STRING LinkTarget, OUT PULONG ResultLength OPTIONAL) { + NTSTATUS Status; UNICODE_STRING SafeLinkTarget = { 0, 0, NULL }; POBJECT_SYMBOLIC_LINK SymlinkObject; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status; + POBJECT_HEADER ObjectHeader; ULONG LengthUsed; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); if (PreviousMode != KernelMode) @@ -945,12 +947,15 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, SYMBOLIC_LINK_QUERY, ObpSymbolicLinkObjectType, PreviousMode, - (PVOID *)&SymlinkObject, + (PVOID*)&SymlinkObject, NULL); if (NT_SUCCESS(Status)) { + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(SymlinkObject); + /* Lock the object */ - ObpAcquireObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject)); + ObpAcquireObjectLock(ObjectHeader); /* * So here's the thing: If you specify a return length, then the @@ -995,7 +1000,7 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, _SEH2_END; /* Unlock and dereference the object */ - ObpReleaseObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject)); + ObpReleaseObjectLock(ObjectHeader); ObDereferenceObject(SymlinkObject); }

2 years, 11 months

[reactos] 01/02: [NTOS:OB] Clarify and fix the usage of the Obp*DirectoryLock*() and ObpReleaseLookupContextObject() functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c63ed5a7af6338cc63f1… commit 4c63ed5a7af6338cc63f1395d9895b22c0827a47 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 25 00:03:56 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 25 00:47:43 2021 +0200 [NTOS:OB] Clarify and fix the usage of the Obp*DirectoryLock*() and ObpReleaseLookupContextObject() functions. - Disentangle the usage of ObpAcquireDirectoryLockExclusive() when it's used only for accessing a directory structure, or as part of a lookup operation. The Obp*DirectoryLock*() -- both shared and exclusive -- functions are only for locking an OB directory, for reading or writing its structure members. When performing lookup operations (insertions/deletions of entries within a directory), use a ObpAcquireLookupContextLock() function that exclusively locks the directory and saves extra lock state, that can be used by ObpReleaseLookupContextObject() for cleanup. - Add documentation for these functions. --- ntoskrnl/include/internal/ob_x.h | 96 ++++++++++++++++++++++++++++++++++------ ntoskrnl/ob/obdir.c | 2 +- ntoskrnl/ob/obinit.c | 6 +-- ntoskrnl/ob/oblife.c | 6 +-- ntoskrnl/ob/obname.c | 12 +++-- 5 files changed, 93 insertions(+), 29 deletions(-) diff --git a/ntoskrnl/include/internal/ob_x.h b/ntoskrnl/include/internal/ob_x.h index 587b82ebc61..0594c08b8f8 100644 --- a/ntoskrnl/include/internal/ob_x.h +++ b/ntoskrnl/include/internal/ob_x.h @@ -169,15 +169,26 @@ ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) } } +/** + * @brief + * Locks a directory for shared access. + * Used for reading members of the directory object. + * + * @param[in] Directory + * The directory to lock. + * + * @param[in] Context + * The lookup lock context. + */ FORCEINLINE VOID ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) + IN POBP_LOOKUP_CONTEXT Context) { - /* It's not, set lock flag */ + /* Update lock flag */ Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_SHARED; - /* Lock it */ + /* Acquire an shared directory lock */ KeEnterCriticalRegion(); ExAcquirePushLockShared(&Directory->Lock); @@ -185,10 +196,21 @@ ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory, Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED; } +/** + * @brief + * Locks a directory for exclusive access. + * Used for writing/reading members of the directory object. + * + * @param[in] Directory + * The directory to lock. + * + * @param[in] Context + * The lookup lock context. + */ FORCEINLINE VOID ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) + IN POBP_LOOKUP_CONTEXT Context) { /* Update lock flag */ Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_EXCLUSIVE; @@ -197,18 +219,24 @@ ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory, KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&Directory->Lock); - /* Set the directory */ - Context->Directory = Directory; - - /* Update lock settings */ + /* Update lock flag */ Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_EXCLUSIVE; - Context->DirectoryLocked = TRUE; } +/** + * @brief + * Unlocks a previously shared or exclusively locked directory. + * + * @param[in] Directory + * The directory to unlock. + * + * @param[in] Context + * The lookup lock context. + */ FORCEINLINE VOID ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) + IN POBP_LOOKUP_CONTEXT Context) { /* Release the lock */ ExReleasePushLock(&Directory->Lock); @@ -216,6 +244,15 @@ ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory, KeLeaveCriticalRegion(); } +/** + * @brief + * Initializes a new object directory lookup context. + * Used for lookup operations (insertions/deletions) in a directory. + * Employed in conjunction with the directory locking functions. + * + * @param[in] Context + * The new lookup context to initialize. + */ FORCEINLINE VOID ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context) @@ -227,6 +264,29 @@ ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context) Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED; } +/** + * @brief + * Locks an object directory lookup context for performing + * lookup operations (insertions/deletions) in a directory. + * The directory is locked for exclusive access. + * + * @param[in] Context + * The lookup context to lock. + * + * @param[in] Directory + * The directory on which the lookup context applies. + */ +FORCEINLINE +VOID +ObpAcquireLookupContextLock(IN POBP_LOOKUP_CONTEXT Context, + IN POBJECT_DIRECTORY Directory) +{ + /* Acquire an exclusive directory lock and save its lock state */ + ObpAcquireDirectoryLockExclusive(Directory, Context); + Context->Directory = Directory; + Context->DirectoryLocked = TRUE; +} + FORCEINLINE VOID ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context) @@ -234,14 +294,14 @@ ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context) POBJECT_HEADER ObjectHeader; POBJECT_HEADER_NAME_INFO HeaderNameInfo; - /* Check if we had found an object */ + /* Check if we had an object */ if (Context->Object) { /* Get the object name information */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - /* release the name information */ + /* Release the name information */ ObpDereferenceNameInfo(HeaderNameInfo); /* Dereference the object */ @@ -250,6 +310,14 @@ ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context) } } +/** + * @brief + * Releases an initialized object directory lookup context. + * Unlocks it if necessary, and dereferences the underlying object. + * + * @param[in] Context + * The lookup context to release. + */ FORCEINLINE VOID ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context) @@ -257,13 +325,13 @@ ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context) /* Check if we came back with the directory locked */ if (Context->DirectoryLocked) { - /* Release the lock */ + /* Release the directory lock */ ObpReleaseDirectoryLock(Context->Directory, Context); Context->Directory = NULL; Context->DirectoryLocked = FALSE; } - /* Clear the context */ + /* Clear the context */ ObpReleaseLookupContextObject(Context); } diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index 1c7b457c726..cb7699ac840 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -573,7 +573,7 @@ NtQueryDirectoryObject(IN HANDLE DirectoryHandle, return Status; } - /* Lock directory in shared mode */ + /* Lock the directory in shared mode */ ObpAcquireDirectoryLockShared(Directory, &LookupContext); /* Start at position 0 */ diff --git a/ntoskrnl/ob/obinit.c b/ntoskrnl/ob/obinit.c index 0b03779d820..8c61db54756 100644 --- a/ntoskrnl/ob/obinit.c +++ b/ntoskrnl/ob/obinit.c @@ -386,11 +386,9 @@ ObPostPhase0: Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - /* Initialize lookup context */ + /* Initialize the lookup context and lock it */ ObpInitializeLookupContext(&Context); - - /* Lock it */ - ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); + ObpAcquireLookupContextLock(&Context, ObpTypeDirectoryObject); /* Loop the object types */ ListHead = &ObpTypeObjectType->TypeList; diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index 5fc68b0d6b5..a01f5373bca 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -1093,8 +1093,8 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName, /* Check if we've already created the directory of types */ if (ObpTypeDirectoryObject) { - /* Acquire the directory lock */ - ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); + /* Lock the lookup context */ + ObpAcquireLookupContextLock(&Context, ObpTypeDirectoryObject); /* Do the lookup */ if (ObpLookupEntryDirectory(ObpTypeDirectoryObject, @@ -1853,7 +1853,7 @@ NtSetInformationObject(IN HANDLE ObjectHandle, OBP_LOOKUP_CONTEXT LookupContext; ObpInitializeLookupContext(&LookupContext); - /* Set its session ID */ + /* Set the directory session ID */ ObpAcquireDirectoryLockExclusive(Directory, &LookupContext); Directory->SessionId = PsGetCurrentProcessSessionId(); ObpReleaseDirectoryLock(Directory, &LookupContext); diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 586561cd9b0..667815d41dc 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -321,11 +321,9 @@ ObpDeleteNameCheck(IN PVOID Object) (ObjectNameInfo->Directory) && !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { - /* Setup a lookup context */ + /* Setup a lookup context and lock it */ ObpInitializeLookupContext(&Context); - - /* Lock the directory */ - ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context); + ObpAcquireLookupContextLock(&Context, ObjectNameInfo->Directory); /* Do the lookup */ Object = ObpLookupEntryDirectory(ObjectNameInfo->Directory, @@ -352,7 +350,7 @@ ObpDeleteNameCheck(IN PVOID Object) ObpDeleteSymbolicLinkName(Object); } - /* Check if the kernel exclusive is set */ + /* Check if the kernel exclusive flag is set */ ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); if ((ObjectNameInfo) && (ObjectNameInfo->QueryReferences & OB_FLAG_KERNEL_EXCLUSIVE)) @@ -843,8 +841,8 @@ ParseFromRoot: /* Check if we are inserting an object */ if (InsertObject) { - /* Lock the directory */ - ObpAcquireDirectoryLockExclusive(Directory, LookupContext); + /* Lock the lookup context */ + ObpAcquireLookupContextLock(LookupContext, Directory); } }

2 years, 11 months

[reactos] 01/01: [NTOS:OB] Acquire the lock before setting directory's session ID

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19cdb521d2ffc4b9bcdba… commit 19cdb521d2ffc4b9bcdbad81adc78e615b648263 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Sep 23 18:11:02 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Sep 24 19:49:40 2021 +0200 [NTOS:OB] Acquire the lock before setting directory's session ID --- ntoskrnl/ob/oblife.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index d649b0f0492..5fc68b0d6b5 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -1849,9 +1849,17 @@ NtSetInformationObject(IN HANDLE ObjectHandle, NULL); if (NT_SUCCESS(Status)) { - /* FIXME: Missng locks */ + /* Setup a lookup context */ + OBP_LOOKUP_CONTEXT LookupContext; + ObpInitializeLookupContext(&LookupContext); + /* Set its session ID */ + ObpAcquireDirectoryLockExclusive(Directory, &LookupContext); Directory->SessionId = PsGetCurrentProcessSessionId(); + ObpReleaseDirectoryLock(Directory, &LookupContext); + + /* We're done, release the context and dereference the directory */ + ObpReleaseLookupContext(&LookupContext); ObDereferenceObject(Directory); } }

2 years, 11 months

[reactos] 01/01: [NTOS:SE] Do not set SE_DACL_PRESENT flag that early

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b4763f1b1eb3231cbfa6… commit 0b4763f1b1eb3231cbfa6f668f003e4296e52edc Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Sep 24 19:39:30 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Sep 24 19:39:30 2021 +0200 [NTOS:SE] Do not set SE_DACL_PRESENT flag that early The function might assign the flag yet it could possibly fail on creating a DACL and insert an "access allowed" right to the access entry within the DACL. In this case, make sure we actually succeeded on all the tasks and THEN assign the flag that the DACL is truly present. Also, make sure that the Current buffer size variable gets its new size so that we avoid overidding the memory of the DACL if the security descriptor wants both a DACL and SACL and so that happens that the DACL memory gets overwritten by the SACL. --- ntoskrnl/se/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index 76584c2c5c0..56f013bf446 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -220,7 +220,6 @@ SeSetWorldSecurityDescriptor( if (SecurityInformation & DACL_SECURITY_INFORMATION) { PACL Dacl = (PACL)((PUCHAR)SdRel + Current); - SdRel->Control |= SE_DACL_PRESENT; Status = RtlCreateAcl(Dacl, sizeof(ACL) + sizeof(ACE) + SidSize, @@ -235,7 +234,9 @@ SeSetWorldSecurityDescriptor( if (!NT_SUCCESS(Status)) return Status; + SdRel->Control |= SE_DACL_PRESENT; SdRel->Dacl = Current; + Current += SidSize; } if (SecurityInformation & SACL_SECURITY_INFORMATION)

2 years, 11 months

[reactos] 01/01: [NTOS:SE] Set the SACL to the World security descriptor

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f341b9080b2840de23467… commit f341b9080b2840de23467996fcd413740e4354a1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Sep 21 19:52:10 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Sep 24 19:13:16 2021 +0200 [NTOS:SE] Set the SACL to the World security descriptor Implement the portion chunk of code that is responsible for setting the system access control list (SACL) to the World security descriptor, based from SeWorldSid (World security identifier). --- ntoskrnl/se/sd.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index ed5d83b65e9..76584c2c5c0 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -181,6 +181,10 @@ SeSetWorldSecurityDescriptor( { SdSize += sizeof(ACL) + sizeof(ACE) + SidSize; } + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + SdSize += sizeof(ACL) + sizeof(ACE) + SidSize; + } if (*BufferLength < SdSize) { @@ -236,7 +240,26 @@ SeSetWorldSecurityDescriptor( if (SecurityInformation & SACL_SECURITY_INFORMATION) { - /* FIXME - SdRel->Control |= SE_SACL_PRESENT; */ + PACL Sacl = (PACL)((PUCHAR)SdRel + Current); + + Status = RtlCreateAcl(Sacl, + sizeof(ACL) + sizeof(ACE) + SidSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | STANDARD_RIGHTS_ALL, + SeWorldSid, + TRUE, + TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + SdRel->Control |= SE_SACL_PRESENT; + SdRel->Sacl = Current; + Current += SidSize; } return STATUS_SUCCESS;

2 years, 11 months

← Newer
1
2
3
4
5
6
7
...
15
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 September 2021