Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/06: [VIDEOPRT] Fix RtlCopyMemory sizeof usage Spotted by GCC8
by Victor Perevertkin 20 Aug '19

20 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09abc443b1de48b19f786… commit 09abc443b1de48b19f786e8eee498547b551ffc7 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 22:15:04 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [VIDEOPRT] Fix RtlCopyMemory sizeof usage Spotted by GCC8 --- win32ss/drivers/videoprt/int10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index 35452501421..f83ed0f3dd2 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -399,7 +399,7 @@ VideoPortInt10( } /* Copy arguments to other format */ - RtlCopyMemory(&Int10BiosArguments, BiosArguments, sizeof(BiosArguments)); + RtlCopyMemory(&Int10BiosArguments, BiosArguments, sizeof(*BiosArguments)); Int10BiosArguments.SegDs = 0; Int10BiosArguments.SegEs = 0; @@ -407,7 +407,7 @@ VideoPortInt10( Status = IntInt10CallBios(NULL, &Int10BiosArguments); /* Copy results back */ - RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(BiosArguments)); + RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(*BiosArguments)); return Status; }

1 0

[reactos] 01/01: [WIN32SS] WindowSnap must not affect the taskbar
by Joachim Henze 20 Aug '19

20 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4193b8d8ace0b84d0bf82… commit 4193b8d8ace0b84d0bf82c72bc9263a35ee414a8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Aug 20 12:07:56 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Aug 20 12:07:56 2019 +0200 [WIN32SS] WindowSnap must not affect the taskbar This fixes regression CORE-16289 where we could not longer move the taskbar at a different than default location, as WindowSnap would interfere. Many Thanks to the patches author Doug Lyons. Eventually the heuristic that we use here to identify the taskbar via used window-styles could be improved later. Theoretically possible that it bails out on some other windows. The regression was introduced by 0.4.12-dev-373-g 7e396787ed00a3939031447725f79697a41878e1 --- win32ss/user/ntuser/defwnd.c | 20 +++++++++++++++++++- win32ss/user/ntuser/nonclient.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index fc55c4acfba..7b07ec4b0ad 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -539,6 +539,9 @@ IntDefWindowProc( PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); LRESULT lResult = 0; USER_REFERENCE_ENTRY Ref; + BOOL IsTaskBar; + DWORD Style; + DWORD ExStyle; if (Msg > WM_USER) return 0; @@ -785,7 +788,22 @@ IntDefWindowProc( { HWND hwndTop = UserGetForegroundWindow(); PWND topWnd = UserGetWindowObject(hwndTop); - if (topWnd) + + /* Test for typical TaskBar ExStyle Values */ + ExStyle = (topWnd->ExStyle & WS_EX_TOOLWINDOW); + TRACE("ExStyle is '%x'.\n", ExStyle); + + /* Test for typical TaskBar Style Values */ + Style = (topWnd->style & (WS_POPUP | WS_VISIBLE | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); + TRACE("Style is '%x'.\n", Style); + + /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ + IsTaskBar = (Style == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) + && (ExStyle == WS_EX_TOOLWINDOW); + TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + + if (topWnd && !IsTaskBar) /* Second test is so we are not touching the Taskbar */ { if ((topWnd->style & WS_THICKFRAME) == 0) { diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index ba8dececb13..0c7dac84c48 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -256,6 +256,8 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) //PMONITOR mon = 0; Don't port sync from wine!!! This breaks explorer task bar sizing!! // The task bar can grow in size and can not reduce due to the change // in the work area. + DWORD ExStyleTB, StyleTB; + BOOL IsTaskBar; Style = pwnd->style; ExStyle = pwnd->ExStyle; @@ -394,6 +396,20 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) /* Exit on button-up */ if (msg.message == WM_LBUTTONUP) { + /* Test for typical TaskBar ExStyle Values */ + ExStyleTB = (ExStyle & WS_EX_TOOLWINDOW); + TRACE("ExStyle is '%x'.\n", ExStyleTB); + + /* Test for typical TaskBar Style Values */ + StyleTB = (Style & (WS_POPUP | WS_VISIBLE | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); + TRACE("Style is '%x'.\n", StyleTB); + + /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ + IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) + && (ExStyleTB == WS_EX_TOOLWINDOW); + TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + // check for snapping if was moved by caption if (hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0) { @@ -401,6 +417,11 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) BOOL doSideSnap = FALSE; UserSystemParametersInfo(SPI_GETWORKAREA, 0, &snapRect, 0); + /* if this is the taskbar, then we want to just exit */ + if (IsTaskBar) + { + break; + } // snap to left if (pt.x <= snapRect.left) {

1 0

[reactos] 01/01: [NTOS:INBV] Refactor boot screen code and resources (#1649)
by Yaroslav Kibysh 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=238ea69ca0cc1c01332ea… commit 238ea69ca0cc1c01332ea9f6211bb2ce3ffb371a Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Tue Aug 20 02:52:25 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 20 01:52:25 2019 +0200 [NTOS:INBV] Refactor boot screen code and resources (#1649) * [NTOS:INBV] Move typedefs to the only single file where they are used. * [NTOS:INBV] Refactor code & resources Remove garbage * [NTOS:INBV] Reduce fade time and remove wait for animation. --- ntoskrnl/inbv/inbv.c | 69 +++++++++++++++------ ntoskrnl/inbv/logo/1.bmp | Bin 20498 -> 0 bytes ntoskrnl/inbv/logo/5.bmp | Bin 16678 -> 0 bytes .../inbv/{logo/4.bmp => resources/barserver.bmp} | Bin .../inbv/{logo/8.bmp => resources/barwksta.bmp} | Bin ntoskrnl/inbv/resources/copyright.bmp | Bin 0 -> 1712 bytes .../inbv/{logo/15.bmp => resources/fserver.bmp} | Bin ntoskrnl/inbv/{logo/7.bmp => resources/fwksta.bmp} | Bin .../inbv/{logo/2.bmp => resources/hibernate.bmp} | Bin .../inbv/{logo/14.bmp => resources/hserver.bmp} | Bin ntoskrnl/inbv/{logo/6.bmp => resources/hwksta.bmp} | Bin ntoskrnl/inbv/{logo => resources}/line.bmp | Bin ntoskrnl/inbv/resources/line_pal.bmp | Bin 0 -> 322 bytes ntoskrnl/inbv/resources/logo.bmp | Bin 0 -> 16518 bytes ntoskrnl/inbv/resources/progress.bmp | Bin 0 -> 358 bytes .../inbv/{logo/3.bmp => resources/shutdown.bmp} | Bin ntoskrnl/include/internal/inbv.h | 21 ------- ntoskrnl/include/resource.h | 4 +- ntoskrnl/ntoskrnl.rc | 25 ++++---- 19 files changed, 67 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 5e96c978c2b..f5cd5652493 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -32,6 +32,27 @@ */ // #define REACTOS_SKUS +typedef struct _INBV_PROGRESS_STATE +{ + ULONG Floor; + ULONG Ceiling; + ULONG Bias; +} INBV_PROGRESS_STATE; + +typedef struct _BT_PROGRESS_INDICATOR +{ + ULONG Count; + ULONG Expected; + ULONG Percentage; +} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; + +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS, + RB_PROGRESS_BAR +} ROT_BAR_TYPE; + /* * Screen resolution (for default VGA) */ @@ -155,8 +176,8 @@ typedef struct tagRGBQUAD static RGBQUAD MainPalette[16]; -#define PALETTE_FADE_STEPS 15 -#define PALETTE_FADE_TIME (20 * 1000) /* 20 ms */ +#define PALETTE_FADE_STEPS 12 +#define PALETTE_FADE_TIME (15 * 1000) /* 15 ms */ /** From bootvid/precomp.h **/ // @@ -1062,7 +1083,7 @@ VOID NTAPI DisplayBootBitmap(IN BOOLEAN TextMode) { - PVOID Header = NULL, Footer = NULL, Screen = NULL; + PVOID BootCopy = NULL, BootProgress = NULL, BootLogo = NULL, Header = NULL, Footer = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED UCHAR Buffer[24 * 9]; @@ -1155,8 +1176,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) */ MmChangeKernelResourceSectionProtection(MM_READWRITE); - /* Load the standard boot screen */ - Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN); + /* Load boot screen logo */ + BootLogo = InbvGetResourceAddress(IDB_LOGO_DEFAULT); #ifdef REACTOS_SKUS Text = NULL; @@ -1197,15 +1218,19 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif /* Make sure we have a logo */ - if (Screen) + if (BootLogo) { /* Save the main image palette for implementing the fade-in effect */ - PBITMAPINFOHEADER BitmapInfoHeader = Screen; - LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); + PBITMAPINFOHEADER BitmapInfoHeader = BootLogo; + LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)BootLogo + BitmapInfoHeader->biSize); RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); - /* Blit the background */ - BitBltPalette(Screen, TRUE, 0, 0); + /* Draw the logo at the center of the screen */ + BitBltAligned(BootLogo, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 0, 0, 34); #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ @@ -1230,6 +1255,22 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif } + /* Load and draw progress bar bitmap */ + BootProgress = InbvGetResourceAddress(IDB_PROGRESS_BAR); + BitBltAligned(BootProgress, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 118, 0, 0); + + /* Load and draw copyright text bitmap */ + BootCopy = InbvGetResourceAddress(IDB_COPYRIGHT); + BitBltAligned(BootCopy, + TRUE, + AL_HORIZONTAL_LEFT, + AL_VERTICAL_BOTTOM, + 22, 0, 0, 20); + #ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ if (Text) BitBltPalette(Text, TRUE, 180, 121); @@ -1309,14 +1350,6 @@ DisplayBootBitmap(IN BOOLEAN TextMode) RotBarSelection = TempRotBarSelection; InbvRotBarInit(); InbvReleaseLock(); - - // FIXME: This was added to allow animation start before the processor hangs - if (TempRotBarSelection != RB_UNSPECIFIED) - { - LARGE_INTEGER Delay; - Delay.QuadPart = -3000000; // 300 ms - KeDelayExecutionThread(KernelMode, FALSE, &Delay); - } } #endif } diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp deleted file mode 100644 index dcc0ae71a55..00000000000 Binary files a/ntoskrnl/inbv/logo/1.bmp and /dev/null differ diff --git a/ntoskrnl/inbv/logo/5.bmp b/ntoskrnl/inbv/logo/5.bmp deleted file mode 100644 index 94fb7a9dfde..00000000000 Binary files a/ntoskrnl/inbv/logo/5.bmp and /dev/null differ diff --git a/ntoskrnl/inbv/logo/4.bmp b/ntoskrnl/inbv/resources/barserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/4.bmp rename to ntoskrnl/inbv/resources/barserver.bmp diff --git a/ntoskrnl/inbv/logo/8.bmp b/ntoskrnl/inbv/resources/barwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/8.bmp rename to ntoskrnl/inbv/resources/barwksta.bmp diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp new file mode 100644 index 00000000000..080e462c659 Binary files /dev/null and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/ntoskrnl/inbv/logo/15.bmp b/ntoskrnl/inbv/resources/fserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/15.bmp rename to ntoskrnl/inbv/resources/fserver.bmp diff --git a/ntoskrnl/inbv/logo/7.bmp b/ntoskrnl/inbv/resources/fwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/7.bmp rename to ntoskrnl/inbv/resources/fwksta.bmp diff --git a/ntoskrnl/inbv/logo/2.bmp b/ntoskrnl/inbv/resources/hibernate.bmp similarity index 100% rename from ntoskrnl/inbv/logo/2.bmp rename to ntoskrnl/inbv/resources/hibernate.bmp diff --git a/ntoskrnl/inbv/logo/14.bmp b/ntoskrnl/inbv/resources/hserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/14.bmp rename to ntoskrnl/inbv/resources/hserver.bmp diff --git a/ntoskrnl/inbv/logo/6.bmp b/ntoskrnl/inbv/resources/hwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/6.bmp rename to ntoskrnl/inbv/resources/hwksta.bmp diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/resources/line.bmp similarity index 100% rename from ntoskrnl/inbv/logo/line.bmp rename to ntoskrnl/inbv/resources/line.bmp diff --git a/ntoskrnl/inbv/resources/line_pal.bmp b/ntoskrnl/inbv/resources/line_pal.bmp new file mode 100644 index 00000000000..5209c246efb Binary files /dev/null and b/ntoskrnl/inbv/resources/line_pal.bmp differ diff --git a/ntoskrnl/inbv/resources/logo.bmp b/ntoskrnl/inbv/resources/logo.bmp new file mode 100644 index 00000000000..53ec10c20c4 Binary files /dev/null and b/ntoskrnl/inbv/resources/logo.bmp differ diff --git a/ntoskrnl/inbv/resources/progress.bmp b/ntoskrnl/inbv/resources/progress.bmp new file mode 100644 index 00000000000..35fd2066714 Binary files /dev/null and b/ntoskrnl/inbv/resources/progress.bmp differ diff --git a/ntoskrnl/inbv/logo/3.bmp b/ntoskrnl/inbv/resources/shutdown.bmp similarity index 100% rename from ntoskrnl/inbv/logo/3.bmp rename to ntoskrnl/inbv/resources/shutdown.bmp diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 3fb6669a584..4f9903e2501 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -1,26 +1,5 @@ #pragma once -typedef struct _INBV_PROGRESS_STATE -{ - ULONG Floor; - ULONG Ceiling; - ULONG Bias; -} INBV_PROGRESS_STATE; - -typedef struct _BT_PROGRESS_INDICATOR -{ - ULONG Count; - ULONG Expected; - ULONG Percentage; -} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; - -typedef enum _ROT_BAR_TYPE -{ - RB_UNSPECIFIED, - RB_SQUARE_CELLS, - RB_PROGRESS_BAR -} ROT_BAR_TYPE; - INIT_FUNCTION VOID NTAPI diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index bb400bb3151..e2537b465f5 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -40,5 +40,7 @@ /* ReactOS additions */ #define IDB_ROTATING_LINE 19 +#define IDB_PROGRESS_BAR 20 +#define IDB_COPYRIGHT 21 -#define IDB_MAX_RESOURCE IDB_ROTATING_LINE +#define IDB_MAX_RESOURCE IDB_COPYRIGHT diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 0a01fe32228..8f1888516ec 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -28,17 +28,18 @@ #include <bugcodes.rc> -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_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" +IDB_HIBERNATE_BAR BITMAP "inbv/resources/hibernate.bmp" +IDB_SHUTDOWN_MSG BITMAP "inbv/resources/shutdown.bmp" +IDB_BAR_DEFAULT BITMAP "inbv/resources/barserver.bmp" +IDB_LOGO_DEFAULT BITMAP "inbv/resources/logo.bmp" +IDB_WKSTA_HEADER BITMAP "inbv/resources/hwksta.bmp" +IDB_WKSTA_FOOTER BITMAP "inbv/resources/fwksta.bmp" +IDB_BAR_WKSTA BITMAP "inbv/resources/barwksta.bmp" +IDB_SERVER_LOGO BITMAP "inbv/resources/logo.bmp" +IDB_SERVER_HEADER BITMAP "inbv/resources/hserver.bmp" +IDB_SERVER_FOOTER BITMAP "inbv/resources/fserver.bmp" /* ReactOS additions */ -IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp" +IDB_ROTATING_LINE BITMAP "inbv/resources/line.bmp" +IDB_PROGRESS_BAR BITMAP "inbv/resources/progress.bmp" +IDB_COPYRIGHT BITMAP "inbv/resources/copyright.bmp"

1 0

[reactos] 01/01: [HAL] Refactor PCI blacklisting for Xbox
by Stanislav Motylkov 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b99272702c94f5c6707dc… commit b99272702c94f5c6707dc095d3d11bb5a0147c43 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Aug 20 00:48:49 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 01:51:16 2019 +0200 [HAL] Refactor PCI blacklisting for Xbox - Use a separate function for detecting blacklisted PCI slots - Blacklist PCI-to-PCI bridge to avoid stack overflow on real hardware Microsoft Xbox 1.3 CORE-16319 CORE-16216 --- hal/halx86/legacy/bus/pcibus.c | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index a0aff2c70da..ab7ed855cdc 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -311,6 +311,36 @@ HalpWritePCIConfig(IN PBUS_HANDLER BusHandler, } } +#ifdef SARCH_XBOX +BOOLEAN +NTAPI +HalpXboxBlacklistedPCISlot(IN PBUS_HANDLER BusHandler, + IN PCI_SLOT_NUMBER Slot) +{ + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + { + DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + return TRUE; + } + + /* Temporary hack to avoid stack overflow in kernel, see CORE-16319 */ + if (BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 8 && Slot.u.bits.FunctionNumber == 0) + { + DPRINT("Blacklisted PCI-to-PCI bridge (00:08.0 - PCI\\VEN_10DE&DEV_01B8, see CORE-16319)\n"); + return TRUE; + } + + return FALSE; +} +#endif + BOOLEAN NTAPI HalpValidPCISlot(IN PBUS_HANDLER BusHandler, @@ -326,18 +356,7 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) - { - DPRINT("HalpValidPCISlot(): Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); - return FALSE; - } + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return FALSE; #endif /* Function 0 doesn't need checking */ @@ -378,16 +397,8 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) { - DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); if (Offset == 0 && Length >= sizeof(USHORT)) { *(PUSHORT)Buffer = PCI_INVALID_VENDORID; @@ -470,18 +481,7 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) - { - DPRINT1("Trying to set data on blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); - return 0; - } + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return 0; #endif /* Normalize the length */

1 0

[reactos] 17/17: [RAPPS] Remove unused function definitions
by Mark Jansen 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cda2bc50ebf9f32e067fa… commit cda2bc50ebf9f32e067faabd8a1449e7bff7b86d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 20 01:41:40 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 01:41:40 2019 +0200 [RAPPS] Remove unused function definitions --- base/applications/rapps/loaddlg.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 201538f7edb..5b31ed06f0e 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -351,9 +351,6 @@ public: static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static DWORD WINAPI ThreadFunc(LPVOID Context); - static BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo>& AppsList, BOOL bIsModal = FALSE); - static BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal = FALSE); - static VOID DownloadApplicationsDB(LPCWSTR lpUrl); static VOID LaunchDownloadDialog(BOOL); };

1 0

[reactos] 16/17: [RAPPS] CDownloadManager: Get rid of the implementation of IBindStatusCallback as we stopped using URLDownloadToFileW a decade ago
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e201d7057741b48d559e… commit 1e201d7057741b48d559e5ee6db2c5b2a2748d92 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Apr 29 15:12:32 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:49 2019 +0200 [RAPPS] CDownloadManager: Get rid of the implementation of IBindStatusCallback as we stopped using URLDownloadToFileW a decade ago --- base/applications/rapps/loaddlg.cpp | 176 +++++++++--------------------------- 1 file changed, 42 insertions(+), 134 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 9880b7691e2..201538f7edb 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -218,127 +218,6 @@ public: END_MSG_MAP() }; -class CDownloadDialog : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IBindStatusCallback -{ - HWND m_hDialog; - BOOL m_UrlHasBeenCopied; - CDownloaderProgress* m_progress; - -public: - ~CDownloadDialog() - { - //DestroyWindow(m_hDialog); - } - - HRESULT Initialize(HWND Dlg, CDownloaderProgress* pProgress) - { - m_hDialog = Dlg; - m_UrlHasBeenCopied = FALSE; - m_progress = pProgress; - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnStartBinding( - DWORD dwReserved, - IBinding *pib) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE GetPriority( - LONG *pnPriority) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnLowResource( - DWORD reserved) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnProgress( - ULONG ulProgress, - ULONG ulProgressMax, - ULONG ulStatusCode, - LPCWSTR szStatusText) - { - HWND Item; - LONG r; - - m_progress->SetProgress(ulProgress, ulProgressMax); - - Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_STATUS); - if (Item && szStatusText && wcslen(szStatusText) > 0 && m_UrlHasBeenCopied == FALSE) - { - SIZE_T len = wcslen(szStatusText) + 1; - ATL::CStringW buf; - DWORD dummyLen; - - /* beautify our url for display purposes */ - if (!InternetCanonicalizeUrlW(szStatusText, buf.GetBuffer(len), &dummyLen, ICU_DECODE | ICU_NO_ENCODE)) - { - /* just use the original */ - buf.ReleaseBuffer(); - buf = szStatusText; - } - else - { - buf.ReleaseBuffer(); - } - - /* paste it into our dialog and don't do it again in this instance */ - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) buf.GetString()); - m_UrlHasBeenCopied = TRUE; - } - - SetLastError(ERROR_SUCCESS); - r = GetWindowLongPtrW(m_hDialog, GWLP_USERDATA); - if (r || GetLastError() != ERROR_SUCCESS) - { - return E_ABORT; - } - - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnStopBinding( - HRESULT hresult, - LPCWSTR szError) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE GetBindInfo( - DWORD *grfBINDF, - BINDINFO *pbindinfo) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnDataAvailable( - DWORD grfBSCF, - DWORD dwSize, - FORMATETC *pformatetc, - STGMEDIUM *pstgmed) - { - return S_OK; - } - - virtual HRESULT STDMETHODCALLTYPE OnObjectAvailable( - REFIID riid, - IUnknown *punk) - { - return S_OK; - } - - BEGIN_COM_MAP(CDownloadDialog) - COM_INTERFACE_ENTRY_IID(IID_IBindStatusCallback, IBindStatusCallback) - END_COM_MAP() -}; - class CDowloadingAppsListView : public CListView { @@ -406,12 +285,6 @@ public: } }; -extern "C" -HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pProgress, riid, ppv); -} - #ifdef USE_CERT_PINNING typedef CHeapPtr<char, CLocalAllocator> CLocalPtr; @@ -472,6 +345,7 @@ class CDownloadManager static CDowloadingAppsListView DownloadsListView; static CDownloaderProgress ProgressBar; static BOOL bCancelled; + static VOID UpdateProgress(HWND hDlg, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText); public: static VOID Add(DownloadInfo info); static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); @@ -586,9 +460,46 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w } } +BOOL UrlHasBeenCopied; + +VOID CDownloadManager::UpdateProgress( + HWND hDlg, + ULONG ulProgress, + ULONG ulProgressMax, + ULONG ulStatusCode, + LPCWSTR szStatusText) +{ + HWND Item; + + ProgressBar.SetProgress(ulProgress, ulProgressMax); + + Item = GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS); + if (Item && szStatusText && wcslen(szStatusText) > 0 && UrlHasBeenCopied == FALSE) + { + SIZE_T len = wcslen(szStatusText) + 1; + ATL::CStringW buf; + DWORD dummyLen; + + /* beautify our url for display purposes */ + if (!InternetCanonicalizeUrlW(szStatusText, buf.GetBuffer(len), &dummyLen, ICU_DECODE | ICU_NO_ENCODE)) + { + /* just use the original */ + buf.ReleaseBuffer(); + buf = szStatusText; + } + else + { + buf.ReleaseBuffer(); + } + + /* paste it into our dialog and don't do it again in this instance */ + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) buf.GetString()); + UrlHasBeenCopied = TRUE; + } +} + DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) { - CComPtr<IBindStatusCallback> dl; ATL::CStringW Path; PWSTR p, q; @@ -700,11 +611,8 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_DOWNLOADING); // download it + UrlHasBeenCopied = FALSE; bTempfile = TRUE; - CDownloadDialog_Constructor(hDlg, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl)); - - if (dl == NULL) - goto end; /* FIXME: this should just be using the system-wide proxy settings */ switch (SettingsInfo.Proxy) @@ -843,7 +751,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) } dwCurrentBytesRead += dwBytesRead; - dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); + UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); } while (dwBytesRead && !bCancelled); CloseHandle(hOut); @@ -858,7 +766,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) ProgressBar.SetMarquee(FALSE); dwContentLen = dwCurrentBytesRead; - dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); + UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); } /* if this thing isn't a RAPPS update and it has a SHA-1 checksum

1 0

[reactos] 15/17: [RAPPS] CDownloadManager: simplify canceling
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db8f1d6f6a662fe1a1d61… commit db8f1d6f6a662fe1a1d61ac793047f4320939a0a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Apr 29 14:21:08 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:48 2019 +0200 [RAPPS] CDownloadManager: simplify canceling --- base/applications/rapps/loaddlg.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 44929c25fe8..9880b7691e2 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -223,7 +223,6 @@ class CDownloadDialog : public IBindStatusCallback { HWND m_hDialog; - PBOOL m_pbCancelled; BOOL m_UrlHasBeenCopied; CDownloaderProgress* m_progress; @@ -233,10 +232,9 @@ public: //DestroyWindow(m_hDialog); } - HRESULT Initialize(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress) + HRESULT Initialize(HWND Dlg, CDownloaderProgress* pProgress) { m_hDialog = Dlg; - m_pbCancelled = pbCancelled; m_UrlHasBeenCopied = FALSE; m_progress = pProgress; return S_OK; @@ -300,7 +298,6 @@ public: r = GetWindowLongPtrW(m_hDialog, GWLP_USERDATA); if (r || GetLastError() != ERROR_SUCCESS) { - *m_pbCancelled = TRUE; return E_ABORT; } @@ -410,9 +407,9 @@ public: }; extern "C" -HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv) { - return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pbCancelled, pProgress, riid, ppv); + return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pProgress, riid, ppv); } #ifdef USE_CERT_PINNING @@ -468,14 +465,13 @@ inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID) } } - // Download dialog (loaddlg.cpp) class CDownloadManager { static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; static CDowloadingAppsListView DownloadsListView; static CDownloaderProgress ProgressBar; - + static BOOL bCancelled; public: static VOID Add(DownloadInfo info); static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); @@ -492,7 +488,7 @@ public: ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; CDowloadingAppsListView CDownloadManager::DownloadsListView; CDownloaderProgress CDownloadManager::ProgressBar; - +BOOL CDownloadManager::bCancelled; VOID CDownloadManager::Add(DownloadInfo info) { @@ -517,6 +513,8 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w HICON hIconSm, hIconBg; ATL::CStringW szTempCaption; + bCancelled = FALSE; + hIconBg = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICON); hIconSm = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICONSM); @@ -573,7 +571,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w case WM_COMMAND: if (wParam == IDCANCEL) { - SetWindowLongW(Dlg, GWLP_USERDATA, 1); + bCancelled = TRUE; PostMessageW(Dlg, WM_CLOSE, 0, 0); } return FALSE; @@ -602,7 +600,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) ULONG dwCurrentBytesRead = 0; ULONG dwStatusLen = sizeof(dwStatus); - BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; BOOL bCab = FALSE; @@ -704,7 +701,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) // download it bTempfile = TRUE; - CDownloadDialog_Constructor(hDlg, &bCancelled, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl)); + CDownloadDialog_Constructor(hDlg, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl)); if (dl == NULL) goto end;

1 0

[reactos] 14/17: [RAPPS] factor CDownloaderProgress class out of CDownloadManager and CDownloadDialog
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6803490a4d944a811fb03… commit 6803490a4d944a811fb0357cc8c89ffbc527b479 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Apr 29 11:33:33 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:48 2019 +0200 [RAPPS] factor CDownloaderProgress class out of CDownloadManager and CDownloadDialog --- base/applications/rapps/loaddlg.cpp | 299 +++++++++++++++++------------------- 1 file changed, 141 insertions(+), 158 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index f774d67f3dd..44929c25fe8 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -41,6 +41,7 @@ #include <rosctrls.h> #include <windowsx.h> +#undef SubclassWindow #include "rosui.h" #include "dialogs.h" @@ -95,6 +96,128 @@ struct DownloadParam }; +class CDownloaderProgress + : public CWindowImpl<CDownloaderProgress, CWindow, CControlWinTraits> +{ + ATL::CStringW m_szProgressText; + +public: + CDownloaderProgress() + { + } + + VOID SetMarquee(BOOL Enable) + { + if (Enable) + ModifyStyle(0, PBS_MARQUEE, 0); + else + ModifyStyle(PBS_MARQUEE, 0, 0); + + SendMessage(PBM_SETMARQUEE, Enable, 0); + } + + VOID SetProgress(ULONG ulProgress, ULONG ulProgressMax) + { + WCHAR szProgress[100]; + + /* format the bits and bytes into pretty and accessible units... */ + StrFormatByteSizeW(ulProgress, szProgress, _countof(szProgress)); + + /* use our subclassed progress bar text subroutine */ + ATL::CStringW ProgressText; + + if (ulProgressMax) + { + /* total size is known */ + WCHAR szProgressMax[100]; + UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax; + + /* send the current progress to the progress bar */ + SendMessage(PBM_SETPOS, uiPercentage, 0); + + /* format total download size */ + StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax)); + + /* generate the text on progress bar */ + ProgressText.Format(L"%u%% \x2014 %ls / %ls", + uiPercentage, + szProgress, + szProgressMax); + } + else + { + /* send the current progress to the progress bar */ + SendMessage(PBM_SETPOS, 0, 0); + + /* total size is not known, display only current size */ + ProgressText.Format(L"%ls...", szProgress); + } + + /* and finally display it */ + SendMessage(WM_SETTEXT, 0, (LPARAM) ProgressText.GetString()); + } + + LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps), hdcMem; + HBITMAP hbmMem; + HANDLE hOld; + RECT myRect; + UINT win_width, win_height; + + GetClientRect(&myRect); + + /* grab the progress bar rect size */ + win_width = myRect.right - myRect.left; + win_height = myRect.bottom - myRect.top; + + /* create an off-screen DC for double-buffering */ + hdcMem = CreateCompatibleDC(hDC); + hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); + + hOld = SelectObject(hdcMem, hbmMem); + + /* call the original draw code and redirect it to our memory buffer */ + DefWindowProc(uMsg, (WPARAM) hdcMem, lParam); + + /* draw our nifty progress text over it */ + SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText(hdcMem, m_szProgressText.GetString(), m_szProgressText.GetLength(), + &myRect, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, + GetSysColor(COLOR_CAPTIONTEXT), + GetSysColor(COLOR_3DSHADOW), + 1, 1); + + /* transfer the off-screen DC to the screen */ + BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); + + /* free the off-screen DC */ + SelectObject(hdcMem, hOld); + DeleteObject(hbmMem); + DeleteDC(hdcMem); + + EndPaint(&ps); + return 0; + } + + LRESULT OnSetText(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + if (lParam) + { + m_szProgressText = (PCWSTR) lParam; + } + return 0; + } + + BEGIN_MSG_MAP(CDownloaderProgress) + MESSAGE_HANDLER(WM_ERASEBKGND, OnPaint) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SETTEXT, OnSetText) + END_MSG_MAP() +}; + class CDownloadDialog : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IBindStatusCallback @@ -102,6 +225,7 @@ class CDownloadDialog : HWND m_hDialog; PBOOL m_pbCancelled; BOOL m_UrlHasBeenCopied; + CDownloaderProgress* m_progress; public: ~CDownloadDialog() @@ -109,11 +233,12 @@ public: //DestroyWindow(m_hDialog); } - HRESULT Initialize(HWND Dlg, BOOL *pbCancelled) + HRESULT Initialize(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress) { m_hDialog = Dlg; m_pbCancelled = pbCancelled; m_UrlHasBeenCopied = FALSE; + m_progress = pProgress; return S_OK; } @@ -145,47 +270,7 @@ public: HWND Item; LONG r; - Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_PROGRESS); - if (Item) - { - WCHAR szProgress[100]; - - /* format the bits and bytes into pretty and accessible units... */ - StrFormatByteSizeW(ulProgress, szProgress, _countof(szProgress)); - - /* use our subclassed progress bar text subroutine */ - ATL::CStringW m_ProgressText; - - if (ulProgressMax) - { - /* total size is known */ - WCHAR szProgressMax[100]; - UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax; - - /* send the current progress to the progress bar */ - SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); - - /* format total download size */ - StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax)); - - /* generate the text on progress bar */ - m_ProgressText.Format(L"%u%% \x2014 %ls / %ls", - uiPercentage, - szProgress, - szProgressMax); - } - else - { - /* send the current progress to the progress bar */ - SendMessageW(Item, PBM_SETPOS, 0, 0); - - /* total size is not known, display only current size */ - m_ProgressText.Format(L"%ls...", - szProgress); - } - /* and finally display it */ - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) m_ProgressText.GetString()); - } + m_progress->SetProgress(ulProgress, ulProgressMax); Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_STATUS); if (Item && szStatusText && wcslen(szStatusText) > 0 && m_UrlHasBeenCopied == FALSE) @@ -325,9 +410,9 @@ public: }; extern "C" -HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv) { - return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pbCancelled, riid, ppv); + return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pbCancelled, pProgress, riid, ppv); } #ifdef USE_CERT_PINNING @@ -389,20 +474,12 @@ class CDownloadManager { static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; static CDowloadingAppsListView DownloadsListView; - - static VOID SetProgressMarquee(HWND Item, BOOL Enable); + static CDownloaderProgress ProgressBar; public: static VOID Add(DownloadInfo info); static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - UINT_PTR uIdSubclass, - DWORD_PTR dwRefData); - static DWORD WINAPI ThreadFunc(LPVOID Context); static BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo>& AppsList, BOOL bIsModal = FALSE); static BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal = FALSE); @@ -414,6 +491,8 @@ public: // CDownloadManager ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; CDowloadingAppsListView CDownloadManager::DownloadsListView; +CDownloaderProgress CDownloadManager::ProgressBar; + VOID CDownloadManager::Add(DownloadInfo info) { @@ -453,10 +532,9 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w { // initialize the default values for our nifty progress bar // and subclass it so that it learns to print a status text - SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - SendMessageW(Item, PBM_SETPOS, 0, 0); - - SetWindowSubclass(Item, DownloadProgressProc, 0, 0); + ProgressBar.SubclassWindow(Item); + ProgressBar.SendMessage(PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + ProgressBar.SendMessage(PBM_SETPOS, 0, 0); } // Add a ListView @@ -510,101 +588,6 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w } } -LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - UINT_PTR uIdSubclass, - DWORD_PTR dwRefData) -{ - static ATL::CStringW szProgressText; - - switch (uMsg) - { - case WM_SETTEXT: - { - if (lParam) - { - szProgressText = (PCWSTR) lParam; - } - return TRUE; - } - - case WM_ERASEBKGND: - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hDC = BeginPaint(hWnd, &ps), hdcMem; - HBITMAP hbmMem; - HANDLE hOld; - RECT myRect; - UINT win_width, win_height; - - GetClientRect(hWnd, &myRect); - - /* grab the progress bar rect size */ - win_width = myRect.right - myRect.left; - win_height = myRect.bottom - myRect.top; - - /* create an off-screen DC for double-buffering */ - hdcMem = CreateCompatibleDC(hDC); - hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); - - hOld = SelectObject(hdcMem, hbmMem); - - /* call the original draw code and redirect it to our memory buffer */ - DefSubclassProc(hWnd, uMsg, (WPARAM) hdcMem, lParam); - - /* draw our nifty progress text over it */ - SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); - DrawShadowText(hdcMem, szProgressText.GetString(), szProgressText.GetLength(), - &myRect, - DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, - GetSysColor(COLOR_CAPTIONTEXT), - GetSysColor(COLOR_3DSHADOW), - 1, 1); - - /* transfer the off-screen DC to the screen */ - BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); - - /* free the off-screen DC */ - SelectObject(hdcMem, hOld); - DeleteObject(hbmMem); - DeleteDC(hdcMem); - - EndPaint(hWnd, &ps); - return 0; - } - - /* Raymond Chen says that we should safely unsubclass all the things! - (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ - - case WM_NCDESTROY: - { - szProgressText.Empty(); - RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); - } - /* Fall-through */ - default: - return DefSubclassProc(hWnd, uMsg, wParam, lParam); - } -} - -VOID CDownloadManager::SetProgressMarquee(HWND Item, BOOL Enable) -{ - if (!Item) - return; - - DWORD style = GetWindowLongPtr(Item, GWL_STYLE); - if (!style) - return; - - if (!SetWindowLongPtr(Item, GWL_STYLE, (Enable ? style | PBS_MARQUEE : style & ~PBS_MARQUEE))) - return; - - SendMessageW(Item, PBM_SETMARQUEE, Enable, 0); -} - DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) { CComPtr<IBindStatusCallback> dl; @@ -650,9 +633,9 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); if (Item) { - SetProgressMarquee(Item, FALSE); - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L""); - SendMessageW(Item, PBM_SETPOS, 0, 0); + ProgressBar.SetMarquee(FALSE); + ProgressBar.SendMessage(WM_SETTEXT, 0, (LPARAM) L""); + ProgressBar.SendMessage(PBM_SETPOS, 0, 0); } // is this URL an update package for RAPPS? if so store it in a different place @@ -721,7 +704,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) // download it bTempfile = TRUE; - CDownloadDialog_Constructor(hDlg, &bCancelled, IID_PPV_ARG(IBindStatusCallback, &dl)); + CDownloadDialog_Constructor(hDlg, &bCancelled, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl)); if (dl == NULL) goto end; @@ -803,7 +786,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!dwContentLen) { // content-length is not known, enable marquee mode - SetProgressMarquee(Item, TRUE); + ProgressBar.SetMarquee(TRUE); } free(urlComponents.lpszScheme); @@ -875,7 +858,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!dwContentLen) { // set progress bar to 100% - SetProgressMarquee(Item, FALSE); + ProgressBar.SetMarquee(FALSE); dwContentLen = dwCurrentBytesRead; dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString());

1 0

[reactos] 13/17: [RAPPS] CDowloadingAppsListView: The download dialog doesn't use the layout engine so there is no need for it to be a CUiWindow
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96fba571e04cc37cdb12e… commit 96fba571e04cc37cdb12e8d0b14645f02f753f6b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Apr 29 11:05:35 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:48 2019 +0200 [RAPPS] CDowloadingAppsListView: The download dialog doesn't use the layout engine so there is no need for it to be a CUiWindow --- base/applications/rapps/loaddlg.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index c4de1e29eec..f774d67f3dd 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -258,7 +258,7 @@ public: }; class CDowloadingAppsListView - : public CUiWindow<CListView> + : public CListView { public: HWND Create(HWND hwndParent) @@ -285,9 +285,8 @@ public: VOID SetDownloadStatus(INT ItemIndex, DownloadStatus Status) { - HWND hListView = GetWindow(); ATL::CStringW szBuffer = LoadStatusString(Status); - ListView_SetItemText(hListView, ItemIndex, 1, const_cast<LPWSTR>(szBuffer.GetString())); + SetItemText(ItemIndex, 1, szBuffer.GetString()); } BOOL AddItem(INT ItemIndex, LPWSTR lpText)

1 0

[reactos] 12/17: [RAPPS] CMainWindow: use more atl
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=653894b972e1fd09af40e… commit 653894b972e1fd09af40ef5a613e4ecb3e832f88 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Apr 28 18:15:55 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:48 2019 +0200 [RAPPS] CMainWindow: use more atl --- base/applications/rapps/gui.cpp | 57 +++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 55df5152175..ad2a13f9a9f 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -802,38 +802,33 @@ private: // UpdateApplicationsList(ENUM_ALL_COMPONENTS); } - HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) - { - return m_TreeView->AddCategory(hRootItem, TextIndex, IconIndex); - } - VOID InitCategoriesList() { HTREEITEM hRootItemInstalled, hRootItemAvailable; - hRootItemInstalled = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); - AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); - AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); - - AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); - - hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); - AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO); - AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO); - AddCategory(hRootItemAvailable, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); - AddCategory(hRootItemAvailable, IDS_CAT_GAMES, IDI_CAT_GAMES); - AddCategory(hRootItemAvailable, IDS_CAT_INTERNET, IDI_CAT_INTERNET); - AddCategory(hRootItemAvailable, IDS_CAT_OFFICE, IDI_CAT_OFFICE); - AddCategory(hRootItemAvailable, IDS_CAT_DEVEL, IDI_CAT_DEVEL); - AddCategory(hRootItemAvailable, IDS_CAT_EDU, IDI_CAT_EDU); - AddCategory(hRootItemAvailable, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); - AddCategory(hRootItemAvailable, IDS_CAT_FINANCE, IDI_CAT_FINANCE); - AddCategory(hRootItemAvailable, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); - AddCategory(hRootItemAvailable, IDS_CAT_TOOLS, IDI_CAT_TOOLS); - AddCategory(hRootItemAvailable, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); - AddCategory(hRootItemAvailable, IDS_CAT_LIBS, IDI_CAT_LIBS); - AddCategory(hRootItemAvailable, IDS_CAT_THEMES, IDI_CAT_THEMES); - AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER); + hRootItemInstalled = m_TreeView->AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); + m_TreeView->AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); + m_TreeView->AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + + m_TreeView->AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); + + hRootItemAvailable = m_TreeView->AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_GAMES, IDI_CAT_GAMES); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_INTERNET, IDI_CAT_INTERNET); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_OFFICE, IDI_CAT_OFFICE); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_DEVEL, IDI_CAT_DEVEL); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_EDU, IDI_CAT_EDU); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_FINANCE, IDI_CAT_FINANCE); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_TOOLS, IDI_CAT_TOOLS); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_LIBS, IDI_CAT_LIBS); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_THEMES, IDI_CAT_THEMES); + m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER); m_TreeView->SetImageList(); m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND); @@ -1562,7 +1557,7 @@ private: break; case ID_SEARCH: - ::SetFocus(m_SearchBar->m_hWnd); + m_SearchBar->SetFocus(); break; case ID_INSTALL: @@ -1871,8 +1866,8 @@ VOID ShowMainWindow(INT nShowCmd) return; /* Maximize it if we must */ - ShowWindow(hMainWnd, ((SettingsInfo.bSaveWndPos && SettingsInfo.Maximized) ? SW_MAXIMIZE : nShowCmd)); - UpdateWindow(hMainWnd); + wnd->ShowWindow((SettingsInfo.bSaveWndPos && SettingsInfo.Maximized) ? SW_MAXIMIZE : nShowCmd); + wnd->UpdateWindow(); /* Load the menu hotkeys */ KeyBrd = LoadAcceleratorsW(NULL, MAKEINTRESOURCEW(HOTKEYS));

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