Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SDK][INCLUDE] Add MENUGETOBJECTINFO structure (#1727)
by Katayama Hirofumi MZ 15 Jul '19

15 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d46edf494dcdc51bd3f23… commit d46edf494dcdc51bd3f237d85458e7e8f060927f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 15 19:59:38 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 15 19:59:38 2019 +0900 [SDK][INCLUDE] Add MENUGETOBJECTINFO structure (#1727) - Add MENUGETOBJECTINFO structure to <winuser.h> header. - Add MNGOF_TOPGAP and MNGOF_BOTTOMGAP constant macros. --- sdk/include/psdk/winuser.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index f9ff766a2a5..3f14ab7eb20 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -3180,6 +3180,17 @@ typedef struct _WNDCLASSEXW { HICON hIconSm; } WNDCLASSEXW,*LPWNDCLASSEXW,*PWNDCLASSEXW; +#define MNGOF_TOPGAP 0x00000001 +#define MNGOF_BOTTOMGAP 0x00000002 + +typedef struct tagMENUGETOBJECTINFO { + DWORD dwFlags; + UINT uPos; + HMENU hmenu; + PVOID riid; + PVOID pvObj; +} MENUGETOBJECTINFO,*PMENUGETOBJECTINFO; + typedef struct tagMENUITEMINFOA { UINT cbSize; UINT fMask;

1 0

[reactos] 01/01: [SDK][INCLUDE] Add HANDLE_WM_* macros to <windowsx.h> (#1726)
by Katayama Hirofumi MZ 15 Jul '19

15 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47e183c521011ff4b6c08… commit 47e183c521011ff4b6c08f8ef0bb79a99d1d9f88 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 15 19:58:34 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 15 19:58:34 2019 +0900 [SDK][INCLUDE] Add HANDLE_WM_* macros to <windowsx.h> (#1726) - Add the following macros into <windowsx.h> header: HANDLE_WM_COPYDATA, HANDLE_WM_DEVICECHANGE, HANDLE_WM_DISPLAYCHANGE, HANDLE_WM_HOTKEY, and HANDLE_WM_MOUSEWHEEL. - Fix HANDLE_WM_CONTEXTMENU macro. --- sdk/include/psdk/windowsx.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index 7a879e67dec..2064c00eafa 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -309,8 +309,9 @@ #define HANDLE_WM_COMMNOTIFY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam),(UINT)LOWORD(lParam)),0) #define HANDLE_WM_COMPACTING(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam)),0) #define HANDLE_WM_COMPAREITEM(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(const COMPAREITEMSTRUCT*)(lParam)) -#define HANDLE_WM_CONTEXTMENU(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)GET_X_LPARAM(lParam),(UINT)GET_Y_LPARAM(lParam))) +#define HANDLE_WM_CONTEXTMENU(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)GET_X_LPARAM(lParam),(UINT)GET_Y_LPARAM(lParam)),0) #define HANDLE_WM_COPY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) +#define HANDLE_WM_COPYDATA(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(PCOPYDATASTRUCT)(lParam)),0) #define HANDLE_WM_CREATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCREATESTRUCT)(lParam)) ? 0 : (LRESULT)-1L) #define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN) #define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG) @@ -324,7 +325,9 @@ #define HANDLE_WM_DELETEITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DELETEITEMSTRUCT*)(lParam)),0) #define HANDLE_WM_DESTROY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_DESTROYCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) +#define HANDLE_WM_DEVICECHANGE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(UINT)(wParam),(DWORD)(wParam)) #define HANDLE_WM_DEVMODECHANGE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCTSTR)(lParam)),0) +#define HANDLE_WM_DISPLAYCHANGE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(wParam)),0) #define HANDLE_WM_DRAWCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_DRAWITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DRAWITEMSTRUCT*)(lParam)),0) #define HANDLE_WM_DROPFILES(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HDROP)(wParam)),0) @@ -338,6 +341,7 @@ #define HANDLE_WM_GETMINMAXINFO(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPMINMAXINFO)(lParam)),0) #define HANDLE_WM_GETTEXT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(int)(wParam),(LPTSTR)(lParam)) #define HANDLE_WM_GETTEXTLENGTH(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)(hwnd) +#define HANDLE_WM_HOTKEY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam)),0) #define HANDLE_WM_HSCROLL(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(lParam),(UINT)(LOWORD(wParam)),(int)(short)HIWORD(wParam)),0) #define HANDLE_WM_HSCROLLCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(int)(short)HIWORD(lParam)),0) #define HANDLE_WM_ICONERASEBKGND(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HDC)(wParam)) @@ -369,6 +373,7 @@ #define HANDLE_WM_MENUSELECT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HMENU)(lParam),(int)(LOWORD(wParam)),(HIWORD(wParam) & MF_POPUP) ? GetSubMenu((HMENU)lParam,LOWORD(wParam)) : 0,(UINT)(((short)HIWORD(wParam) == -1) ? 0xFFFFFFFF : HIWORD(wParam))),0) #define HANDLE_WM_MOUSEACTIVATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam)) #define HANDLE_WM_MOUSEMOVE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) +#define HANDLE_WM_MOUSEWHEEL(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(int)(short)HIWORD(wParam),(UINT)(short)LOWORD(wParam)),0) #define HANDLE_WM_MOVE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam)),0) #define HANDLE_WM_NCACTIVATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(BOOL)(wParam),0,0) #define HANDLE_WM_NCCALCSIZE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(BOOL)(0),(NCCALCSIZE_PARAMS*)(lParam))

1 0

[reactos] 05/05: [NTOS:INBV] Fix the bitmaps' palette and recompress them in RLE. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d6f61085653ec084a4d… commit e2d6f61085653ec084a4dc7e22d8bcc54df1320f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 14 20:07:09 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:52 2019 +0200 [NTOS:INBV] Fix the bitmaps' palette and recompress them in RLE. (#1649) They don't need to have a zeroed-out palette now that we can automatically reset it from within the code. Co-authored-by: Yaroslav Kibysh <yanet.prod(a)gmail.com> --- ntoskrnl/inbv/logo/1.bmp | Bin 21652 -> 20498 bytes ntoskrnl/inbv/logo/15.bmp | Bin 416 -> 386 bytes ntoskrnl/inbv/logo/4.bmp | Bin 228 -> 226 bytes ntoskrnl/inbv/logo/6.bmp | Bin 2896 -> 2896 bytes ntoskrnl/inbv/logo/7.bmp | Bin 1078 -> 490 bytes ntoskrnl/inbv/logo/8.bmp | Bin 228 -> 226 bytes ntoskrnl/inbv/logo/line.bmp | Bin 2038 -> 848 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp index 9c4e503872f..dcc0ae71a55 100644 Binary files a/ntoskrnl/inbv/logo/1.bmp and b/ntoskrnl/inbv/logo/1.bmp differ diff --git a/ntoskrnl/inbv/logo/15.bmp b/ntoskrnl/inbv/logo/15.bmp index 88481b9284d..bc6cebb0467 100644 Binary files a/ntoskrnl/inbv/logo/15.bmp and b/ntoskrnl/inbv/logo/15.bmp differ diff --git a/ntoskrnl/inbv/logo/4.bmp b/ntoskrnl/inbv/logo/4.bmp index 7aabbbfeb6e..8d443e6e99e 100644 Binary files a/ntoskrnl/inbv/logo/4.bmp and b/ntoskrnl/inbv/logo/4.bmp differ diff --git a/ntoskrnl/inbv/logo/6.bmp b/ntoskrnl/inbv/logo/6.bmp index 08344117cb2..41dece0474d 100644 Binary files a/ntoskrnl/inbv/logo/6.bmp and b/ntoskrnl/inbv/logo/6.bmp differ diff --git a/ntoskrnl/inbv/logo/7.bmp b/ntoskrnl/inbv/logo/7.bmp index 24ea2137758..34d69651f03 100644 Binary files a/ntoskrnl/inbv/logo/7.bmp and b/ntoskrnl/inbv/logo/7.bmp differ diff --git a/ntoskrnl/inbv/logo/8.bmp b/ntoskrnl/inbv/logo/8.bmp index 344e0b23c44..de040cf9286 100644 Binary files a/ntoskrnl/inbv/logo/8.bmp and b/ntoskrnl/inbv/logo/8.bmp differ diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/logo/line.bmp index c5d214e3946..7ea595bf9f6 100644 Binary files a/ntoskrnl/inbv/logo/line.bmp and b/ntoskrnl/inbv/logo/line.bmp differ

1 0

[reactos] 04/05: [NTOS:INBV] Express some coordinates in terms of screen size. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64a53b304e5edf1606bbb… commit 64a53b304e5edf1606bbb0ed89b69bce2973f354 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 7 23:15:53 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:51 2019 +0200 [NTOS:INBV] Express some coordinates in terms of screen size. (#1649) --- ntoskrnl/inbv/inbv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index d0d382e8e68..5e96c978c2b 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -99,7 +99,7 @@ static BOOLEAN RotBarThreadActive = FALSE; static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; static ROT_BAR_STATUS PltRotBarStatus = 0; static UCHAR RotBarBuffer[24 * 9]; -static UCHAR RotLineBuffer[640 * 6]; +static UCHAR RotLineBuffer[SCREEN_WIDTH * 6]; #endif @@ -193,7 +193,7 @@ BootLogoFadeIn(VOID) ULONG Iteration, Index, ClrUsed; LARGE_INTEGER Delay; - Delay.QuadPart = - (PALETTE_FADE_TIME * 10); + Delay.QuadPart = -(PALETTE_FADE_TIME * 10); /* Check if we are installed and we own the display */ if (!InbvBootDriverInstalled || @@ -1028,15 +1028,15 @@ InbvRotationThread( else if (RotBarSelection == RB_PROGRESS_BAR) { Delay.QuadPart = -600000; // 60 ms - Total = 640; + Total = SCREEN_WIDTH; Index %= Total; /* Right part */ - VidBufferToScreenBlt(RotLineBuffer, Index, 474, 640 - Index, 6, 640); + VidBufferToScreenBlt(RotLineBuffer, Index, SCREEN_HEIGHT-6, SCREEN_WIDTH - Index, 6, SCREEN_WIDTH); if (Index > 0) { /* Left part */ - VidBufferToScreenBlt(RotLineBuffer + (640 - Index) / 2, 0, 474, Index - 2, 6, 640); + VidBufferToScreenBlt(RotLineBuffer + (SCREEN_WIDTH - Index) / 2, 0, SCREEN_HEIGHT-6, Index - 2, 6, SCREEN_WIDTH); } Index += 32; } @@ -1103,8 +1103,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) { /* Workstation; set colors */ InbvSetTextColor(15); - InbvSolidColorFill(0, 0, 639, 479, 7); - InbvSolidColorFill(0, 421, 639, 479, 1); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 7); + InbvSolidColorFill(0, 421, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); @@ -1114,8 +1114,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) { /* Server; set colors */ InbvSetTextColor(14); - InbvSolidColorFill(0, 0, 639, 479, 6); - InbvSolidColorFill(0, 421, 639, 479, 1); + InbvSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 6); + InbvSolidColorFill(0, 421, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_SERVER_HEADER); @@ -1259,8 +1259,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (LineBmp) { /* Draw the line and store it in global buffer */ - BitBltPalette(LineBmp, TRUE, 0, 474); - InbvScreenToBufferBlt(RotLineBuffer, 0, 474, 640, 6, 640); + BitBltPalette(LineBmp, TRUE, 0, SCREEN_HEIGHT-6); + InbvScreenToBufferBlt(RotLineBuffer, 0, SCREEN_HEIGHT-6, SCREEN_WIDTH, 6, SCREEN_WIDTH); } } else @@ -1355,7 +1355,7 @@ FinalizeBootLogo(VOID) if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) { /* Clear the screen */ - VidSolidColorFill(0, 0, 639, 479, 0); + VidSolidColorFill(0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, 0); } /* Reset progress bar and lock */

1 0

[reactos] 03/05: [NTOS:INBV] Implement BitBltPalette() and BitBltAligned() and use them for aligning bitmaps. (#1649)
by Yaroslav Kibysh 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc2eb409c1d838733abcf… commit dc2eb409c1d838733abcfcb22bbaa90dda434795 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Tue Jun 11 22:27:25 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:50 2019 +0200 [NTOS:INBV] Implement BitBltPalette() and BitBltAligned() and use them for aligning bitmaps. (#1649) Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- ntoskrnl/inbv/inbv.c | 170 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 153 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 295ffac0142..d0d382e8e68 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -5,6 +5,10 @@ #include <debug.h> #include "bootvid/bootvid.h" +/* See also mm/ARM3/miarm.h */ +#define MM_READONLY 1 // PAGE_READONLY +#define MM_READWRITE 4 // PAGE_WRITECOPY + #ifndef TAG_OSTR #define TAG_OSTR 'RTSO' #endif @@ -28,6 +32,29 @@ */ // #define REACTOS_SKUS +/* + * Screen resolution (for default VGA) + */ +#define SCREEN_WIDTH 640 +#define SCREEN_HEIGHT 480 + +/* + * BitBltAligned() alignments + */ +typedef enum _BBLT_VERT_ALIGNMENT +{ + AL_VERTICAL_TOP = 0, + AL_VERTICAL_CENTER, + AL_VERTICAL_BOTTOM +} BBLT_VERT_ALIGNMENT; + +typedef enum _BBLT_HORZ_ALIGNMENT +{ + AL_HORIZONTAL_LEFT = 0, + AL_HORIZONTAL_CENTER, + AL_HORIZONTAL_RIGHT +} BBLT_HORZ_ALIGNMENT; + /* * Enable this define when Inbv will support rotating progress bar. */ @@ -210,6 +237,96 @@ BootLogoFadeIn(VOID) } } +static VOID +BitBltPalette( + IN PVOID Image, + IN BOOLEAN NoPalette, + IN ULONG X, + IN ULONG Y) +{ + LPRGBQUAD Palette; + RGBQUAD OrigPalette[RTL_NUMBER_OF(MainPalette)]; + + /* If requested, remove the palette from the image */ + if (NoPalette) + { + /* Get bitmap header and palette */ + PBITMAPINFOHEADER BitmapInfoHeader = Image; + Palette = (LPRGBQUAD)((PUCHAR)Image + BitmapInfoHeader->biSize); + + /* Save the image original palette and remove palette information */ + RtlCopyMemory(OrigPalette, Palette, sizeof(OrigPalette)); + RtlZeroMemory(Palette, sizeof(OrigPalette)); + } + + /* Draw the image */ + InbvBitBlt(Image, X, Y); + + /* Restore the image original palette */ + if (NoPalette) + { + RtlCopyMemory(Palette, OrigPalette, sizeof(OrigPalette)); + } +} + +static VOID +BitBltAligned( + IN PVOID Image, + IN BOOLEAN NoPalette, + IN BBLT_HORZ_ALIGNMENT HorizontalAlignment, + IN BBLT_VERT_ALIGNMENT VerticalAlignment, + IN ULONG MarginLeft, + IN ULONG MarginTop, + IN ULONG MarginRight, + IN ULONG MarginBottom) +{ + PBITMAPINFOHEADER BitmapInfoHeader = Image; + ULONG X, Y; + + /* Calculate X */ + switch (HorizontalAlignment) + { + case AL_HORIZONTAL_LEFT: + X = MarginLeft - MarginRight; + break; + + case AL_HORIZONTAL_CENTER: + X = MarginLeft - MarginRight + (SCREEN_WIDTH - BitmapInfoHeader->biWidth + 1) / 2; + break; + + case AL_HORIZONTAL_RIGHT: + X = MarginLeft - MarginRight + SCREEN_WIDTH - BitmapInfoHeader->biWidth; + break; + + default: + /* Unknown */ + return; + } + + /* Calculate Y */ + switch (VerticalAlignment) + { + case AL_VERTICAL_TOP: + Y = MarginTop - MarginBottom; + break; + + case AL_VERTICAL_CENTER: + Y = MarginTop - MarginBottom + (SCREEN_HEIGHT - BitmapInfoHeader->biHeight + 1) / 2; + break; + + case AL_VERTICAL_BOTTOM: + Y = MarginTop - MarginBottom + SCREEN_HEIGHT - BitmapInfoHeader->biHeight; + break; + + default: + /* Unknown */ + return; + } + + /* Finally draw the image */ + BitBltPalette(Image, NoPalette, X, Y); +} + /* FUNCTIONS *****************************************************************/ INIT_FUNCTION @@ -975,6 +1092,12 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* Check if this is text mode */ if (TextMode) { + /* + * Make the kernel resource section temporarily writable, + * as we are going to change the bitmaps' palette in place. + */ + MmChangeKernelResourceSectionProtection(MM_READWRITE); + /* Check the type of the OS: workstation or server */ if (SharedUserData->NtProductType == NtProductWinNt) { @@ -1006,15 +1129,32 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (Header && Footer) { /* BitBlt them on the screen */ - InbvBitBlt(Footer, 0, 419); - InbvBitBlt(Header, 0, 0); + BitBltAligned(Footer, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_BOTTOM, + 0, 0, 0, 59); + BitBltAligned(Header, + FALSE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_TOP, + 0, 0, 0, 0); } + + /* Restore the kernel resource section protection to be read-only */ + MmChangeKernelResourceSectionProtection(MM_READONLY); } else { /* Is the boot driver installed? */ if (!InbvBootDriverInstalled) return; + /* + * Make the kernel resource section temporarily writable, + * as we are going to change the bitmaps' palette in place. + */ + MmChangeKernelResourceSectionProtection(MM_READWRITE); + /* Load the standard boot screen */ Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN); @@ -1059,20 +1199,13 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* Make sure we have a logo */ if (Screen) { - PBITMAPINFOHEADER BitmapInfoHeader; - LPRGBQUAD Palette; - - /* - * Save the main image palette and replace it with black palette, - * so that we can do fade-in effect later. - */ - BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; - Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); + /* Save the main image palette for implementing the fade-in effect */ + PBITMAPINFOHEADER BitmapInfoHeader = Screen; + LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); - RtlZeroMemory(Palette, sizeof(MainPalette)); /* Blit the background */ - InbvBitBlt(Screen, 0, 0); + BitBltPalette(Screen, TRUE, 0, 0); #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ @@ -1099,7 +1232,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ - if (Text) InbvBitBlt(Text, 180, 121); + if (Text) BitBltPalette(Text, TRUE, 180, 121); #endif #ifdef INBV_ROTBAR_IMPLEMENTED @@ -1126,7 +1259,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (LineBmp) { /* Draw the line and store it in global buffer */ - InbvBitBlt(LineBmp, 0, 474); + BitBltPalette(LineBmp, TRUE, 0, 474); InbvScreenToBufferBlt(RotLineBuffer, 0, 474, 640, 6, 640); } } @@ -1137,6 +1270,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) } #endif + /* Restore the kernel resource section protection to be read-only */ + MmChangeKernelResourceSectionProtection(MM_READONLY); + /* Display the boot logo and fade it in */ BootLogoFadeIn(); @@ -1194,10 +1330,10 @@ DisplayFilter(PCHAR *String) static BOOLEAN DotHack = TRUE; /* If "." is given set *String to empty string */ - if(DotHack && strcmp(*String, ".") == 0) + if (DotHack && strcmp(*String, ".") == 0) *String = ""; - if(**String) + if (**String) { /* Remove the filter */ InbvInstallDisplayStringFilter(NULL);

1 0

[reactos] 02/05: [NTOS:MM] Add a MmChangeKernelResourceSectionProtection() helper. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3625238ecb5eec1b65d6e… commit 3625238ecb5eec1b65d6efd756013d3738bacb95 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 14 00:04:19 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:49 2019 +0200 [NTOS:MM] Add a MmChangeKernelResourceSectionProtection() helper. (#1649) This allows setting the memory protection of the kernel's resource section as will. MmMakeKernelResourceSectionWritable() is re-implemented around this helper. --- ntoskrnl/include/internal/mm.h | 4 ++++ ntoskrnl/mm/ARM3/sysldr.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index da3a720d4dc..32fd7b1146d 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1370,6 +1370,10 @@ MiInitializeLoadedModuleList( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +BOOLEAN +NTAPI +MmChangeKernelResourceSectionProtection(IN ULONG_PTR ProtectionMask); + VOID NTAPI MmMakeKernelResourceSectionWritable(VOID); diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 036c38505d6..ab6e1165cc1 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2281,20 +2281,20 @@ MiInitializeLoadedModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return TRUE; } -VOID +BOOLEAN NTAPI -MmMakeKernelResourceSectionWritable(VOID) +MmChangeKernelResourceSectionProtection(IN ULONG_PTR ProtectionMask) { PMMPTE PointerPte; MMPTE TempPte; /* Don't do anything if the resource section is already writable */ if (MiKernelResourceStartPte == NULL || MiKernelResourceEndPte == NULL) - return; + return FALSE; /* If the resource section is physical, we cannot change its protection */ if (MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(MiKernelResourceStartPte))) - return; + return FALSE; /* Loop the PTEs */ for (PointerPte = MiKernelResourceStartPte; PointerPte < MiKernelResourceEndPte; ++PointerPte) @@ -2303,19 +2303,36 @@ MmMakeKernelResourceSectionWritable(VOID) TempPte = *PointerPte; /* Update the protection */ - MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, MM_READWRITE, TempPte.u.Hard.PageFrameNumber); + MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, ProtectionMask, TempPte.u.Hard.PageFrameNumber); MI_UPDATE_VALID_PTE(PointerPte, TempPte); } - /* - * Invalidate the cached resource section PTEs - * so as to not change its protection again later. - */ - MiKernelResourceStartPte = NULL; - MiKernelResourceEndPte = NULL; - /* Only flush the current processor's TLB */ KeFlushCurrentTb(); + return TRUE; +} + +VOID +NTAPI +MmMakeKernelResourceSectionWritable(VOID) +{ + /* Don't do anything if the resource section is already writable */ + if (MiKernelResourceStartPte == NULL || MiKernelResourceEndPte == NULL) + return; + + /* If the resource section is physical, we cannot change its protection */ + if (MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(MiKernelResourceStartPte))) + return; + + if (MmChangeKernelResourceSectionProtection(MM_READWRITE)) + { + /* + * Invalidate the cached resource section PTEs + * so as to not change its protection again later. + */ + MiKernelResourceStartPte = NULL; + MiKernelResourceEndPte = NULL; + } } LOGICAL

1 0

[reactos] 01/05: [NTOS:INBV] Classify the bitmap resources. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3e22b99a4577c6c2651c… commit a3e22b99a4577c6c2651cddf01a96899d519f3a1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 7 00:33:06 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:48 2019 +0200 [NTOS:INBV] Classify the bitmap resources. (#1649) See "How to change Windows XP boot logo" at http://www.reversing.be/article.php?story=20061209171938444 as well as the "Boot Editor for WinXP" program for more details. --- ntoskrnl/inbv/inbv.c | 2 +- ntoskrnl/include/resource.h | 38 ++++++++++++++++++++++++++++---------- ntoskrnl/ntoskrnl.rc | 6 ++++-- ntoskrnl/po/poshtdwn.c | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index c1ece52461e..295ffac0142 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -1048,7 +1048,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef INBV_ROTBAR_IMPLEMENTED /* Server product, use appropriate status bar color */ - Bar = InbvGetResourceAddress(IDB_BAR_SERVER); + Bar = InbvGetResourceAddress(IDB_BAR_DEFAULT); #endif } #else diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index 2f7c22b1cc4..bb400bb3151 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -1,26 +1,44 @@ #pragma once +/* + * List of all the bitmap overlay resources present in the NT kernel + * of Windows XP, Windows Server 2003 and their variations. + * See "How to change Windows XP boot logo" at + * http://www.reversing.be/article.php?story=20061209171938444 + * as well as the "Boot Editor for WinXP" program for more details. + */ + #define IDB_BOOT_SCREEN 1 #define IDB_HIBERNATE_BAR 2 #define IDB_SHUTDOWN_MSG 3 -#define IDB_DEFAULT_LOGO 5 +#define IDB_BAR_DEFAULT 4 +#define IDB_LOGO_DEFAULT 5 + #define IDB_WKSTA_HEADER 6 #define IDB_WKSTA_FOOTER 7 -#define IDB_BAR_SERVER 4 #define IDB_BAR_WKSTA 8 #define IDB_BAR_HOME 9 -#define IDB_ROTATING_LINE 19 - -#define IDB_PROF_TEXT 10 -#define IDB_HOME_TEXT 11 -#define IDB_EMBEDDED_TEXT 12 -#define IDB_MCE_TEXT 18 #define IDB_SERVER_LOGO 13 #define IDB_SERVER_HEADER 14 #define IDB_SERVER_FOOTER 15 -#define IDB_STORAGE_SERVER 16 -#define IDB_CLUSTER_SERVER 17 + +/* Workstation editions Overlays */ +#define IDB_TEXT_PROF 10 // Professional +#define IDB_TEXT_HOME 11 // Home Edition +#define IDB_TEXT_EMBEDDED 12 // Embedded +#define IDB_TEXT_SVRFAMILY 13 // Server Family +#define IDB_TEXT_DOTNET 16 // .NET 2003 +#define IDB_TEXT_TABLETPC 17 // Tablet PC Edition +#define IDB_TEXT_MEDIACTR 18 // Media Center Edition + +/* Server editions Overlays */ +#define IDB_STORAGE_SERVER 16 // Storage Server +#define IDB_CLUSTER_SERVER 17 // Compute Cluster Edition +#define IDB_STORAGE_SERVER2 18 + +/* ReactOS additions */ +#define IDB_ROTATING_LINE 19 #define IDB_MAX_RESOURCE IDB_ROTATING_LINE diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index dbe2caccc02..0a01fe32228 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -31,12 +31,14 @@ IDB_BOOT_SCREEN BITMAP "inbv/logo/1.bmp" IDB_HIBERNATE_BAR BITMAP "inbv/logo/2.bmp" IDB_SHUTDOWN_MSG BITMAP "inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" -IDB_DEFAULT_LOGO BITMAP "inbv/logo/5.bmp" +IDB_BAR_DEFAULT BITMAP "inbv/logo/4.bmp" +IDB_LOGO_DEFAULT BITMAP "inbv/logo/5.bmp" IDB_WKSTA_HEADER BITMAP "inbv/logo/6.bmp" IDB_WKSTA_FOOTER BITMAP "inbv/logo/7.bmp" IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" + +/* ReactOS additions */ IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp" diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index dd9bcc2dbb4..17adbc2a415 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -165,7 +165,7 @@ PopShutdownHandler(VOID) /* Display shutdown logo and message */ Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); - Logo2 = InbvGetResourceAddress(IDB_DEFAULT_LOGO); + Logo2 = InbvGetResourceAddress(IDB_LOGO_DEFAULT); if ((Logo1) && (Logo2)) { InbvBitBlt(Logo1, 220, 352);

1 0

[reactos] 01/01: [UMPNPMGR] Fix build.
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e095695a645eced297699… commit e095695a645eced297699daf02edca47c4a732e5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 14 22:17:50 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:17:50 2019 +0200 [UMPNPMGR] Fix build. --- base/services/umpnpmgr/rpcserver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 58a28e3cb4e..32ff58d5865 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -2723,17 +2723,13 @@ PNP_GetDeviceStatus( DWORD *pulProblem, DWORD ulFlags) { - PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - CONFIGRET ret = CR_SUCCESS; - NTSTATUS Status; - UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDeviceStatus(%p %S %p %p)\n", hBinding, pDeviceID, pulStatus, pulProblem, ulFlags); - return GetDeviceStatus(pDeviceId, pulStatus, pulProblem); + return GetDeviceStatus(pDeviceID, pulStatus, pulProblem); }

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceStatus: Move the code that retrieves the status of a device into a separate function so that we can use in other functions.
by Eric Kohl 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47e90b5ea44076fa7a771… commit 47e90b5ea44076fa7a77144939dfcb453f6b7d3f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 14 21:50:06 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 14 21:50:06 2019 +0200 [UMPNPMGR] PNP_GetDeviceStatus: Move the code that retrieves the status of a device into a separate function so that we can use in other functions. --- base/services/umpnpmgr/rpcserver.c | 59 ++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 63148af8623..58a28e3cb4e 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -191,6 +191,41 @@ SplitDeviceInstanceID(IN LPWSTR pszDeviceInstanceID, } +static +CONFIGRET +GetDeviceStatus( + _In_ LPWSTR pDeviceID, + _Out_ DWORD *pulStatus, + _Out_ DWORD *pulProblem) +{ + PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; + CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; + + DPRINT("GetDeviceStatus(%S %p %p)\n", + pDeviceID, pulStatus, pulProblem); + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pDeviceID); + PlugPlayData.Operation = 0; /* Get status */ + + Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); + if (NT_SUCCESS(Status)) + { + *pulStatus = PlugPlayData.DeviceStatus; + *pulProblem = PlugPlayData.DeviceProblem; + } + else + { + ret = NtStatusToCrError(Status); + } + + return ret; +} + + /* PUBLIC FUNCTIONS **********************************************************/ /* Function 0 */ @@ -2695,28 +2730,10 @@ PNP_GetDeviceStatus( UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulFlags); - DPRINT("PNP_GetDeviceStatus() called\n"); - - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - pDeviceID); - PlugPlayData.Operation = 0; /* Get status */ - - Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); - if (NT_SUCCESS(Status)) - { - *pulStatus = PlugPlayData.DeviceStatus; - *pulProblem = PlugPlayData.DeviceProblem; - } - else - { - ret = NtStatusToCrError(Status); - } - - DPRINT("PNP_GetDeviceStatus() done (returns %lx)\n", ret); + DPRINT("PNP_GetDeviceStatus(%p %S %p %p)\n", + hBinding, pDeviceID, pulStatus, pulProblem, ulFlags); - return ret; + return GetDeviceStatus(pDeviceId, pulStatus, pulProblem); }

1 0

[reactos] 01/01: [ACPICA] Fix MSVC x64 build
by Timo Kreuzer 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad607262885c7f23fe1fb… commit ad607262885c7f23fe1fba0de4f48ab0119cb94b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 26 15:06:32 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 14 11:35:50 2019 +0200 [ACPICA] Fix MSVC x64 build See CORE-16082 --- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 4 +-- drivers/bus/acpi/acpica/include/platform/acwin64.h | 41 ++++++++++++++++++++++ drivers/bus/acpi/acpica/namespace/nsnames.c | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index 57d9693c65e..936cbf4ebff 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -149,7 +149,7 @@ #endif #ifdef __REACTOS__ - +#ifdef _M_IX86 /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ #ifdef ACPI_APPLICATION @@ -208,7 +208,7 @@ __asm exit_rel: \ __asm mov Pnd, al \ } - +#endif /* _M_IX86 */ #endif /* __REACTOS__ */ /* warn C4100: unreferenced formal parameter */ diff --git a/drivers/bus/acpi/acpica/include/platform/acwin64.h b/drivers/bus/acpi/acpica/include/platform/acwin64.h index 5dda0a5de8e..9ad34088c9d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin64.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin64.h @@ -83,6 +83,7 @@ /*! [Begin] no source code translation */ +#ifndef __REACTOS__ #define ACPI_FLUSH_CPU_CACHE() /* @@ -99,6 +100,46 @@ #endif +#else /* __REACTOS__ */ + +#ifdef ACPI_APPLICATION +#define ACPI_FLUSH_CPU_CACHE() +#else +#define ACPI_FLUSH_CPU_CACHE() __wbinvd() +#endif + +#define ACPI_ACQUIRE_GLOBAL_LOCK(FacsPtr, Acq) \ +{ \ + BOOLEAN acquired = 0xFF; \ +\ + if ((FacsPtr) != 0) \ + { \ + UINT32 compare, prev, newval; \ + UINT32* lock = &((FacsPtr)->GlobalLock); \ + do \ + { \ + compare = *lock; \ + newval = (compare & ~1) | ((compare >> 1) & 1) | 2; \ + prev = InterlockedCompareExchange(lock, newval, compare); \ + } while (prev != compare); \ + acquired = ((newval & 0xFF) < 3) ? 0xFF : 0x00; \ + } \ + (Acq) = acquired; \ +} + +#define ACPI_RELEASE_GLOBAL_LOCK(FacsPtr, Pnd) \ +{ \ + BOOLEAN pending = 0; \ +\ + if ((FacsPtr) != 0) \ + { \ + pending = InterlockedAnd(&(FacsPtr)->GlobalLock, ~3) & 1; \ + } \ + (Pnd) = pending; \ +} + +#endif /* __REACTOS__ */ + /*! [End] no source code translation !*/ #endif /* __ACWIN_H__ */ diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c b/drivers/bus/acpi/acpica/namespace/nsnames.c index 6ab5cc64430..3c40c6ac3de 100644 --- a/drivers/bus/acpi/acpica/namespace/nsnames.c +++ b/drivers/bus/acpi/acpica/namespace/nsnames.c @@ -434,7 +434,7 @@ AcpiNsBuildPrefixedPathname ( char *FullPath = NULL; char *ExternalPath = NULL; char *PrefixPath = NULL; - UINT32 PrefixPathLength = 0; + SIZE_T PrefixPathLength = 0; /* If there is a prefix, get the pathname to it */

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