Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FREELDR] Fix some more register accesses and magic values
by Stanislav Motylkov 08 May '20

08 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10e52f68b2c3b9968b61d… commit 10e52f68b2c3b9968b61dc8be973d7895ec6a0a4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri May 8 23:02:42 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 8 23:02:42 2020 +0300 [FREELDR] Fix some more register accesses and magic values Addendum to 764e884. --- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 4 ++-- boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c | 13 +++++++------ boot/freeldr/freeldr/include/arch/i386/machxbox.h | 2 ++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 438e887d059..b1ed4c94be0 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -261,8 +261,8 @@ MachInit(const char *CmdLine) /* Check for Xbox by identifying device at PCI 0:0:0, if it's * 0x10DE/0x02A5 then we're running on an Xbox */ - WRITE_PORT_ULONG((ULONG *)0xCF8, CONFIG_CMD(0, 0, 0)); - PciId = READ_PORT_ULONG((ULONG *)0xCFC); + WRITE_PORT_ULONG((PULONG)0xCF8, CONFIG_CMD(0, 0, 0)); + PciId = READ_PORT_ULONG((PULONG)0xCFC); if (PciId != 0x02A510DE) { ERR("This is not original Xbox!\n"); diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c index e8ea7b016ea..29e1382be18 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c @@ -60,11 +60,12 @@ XboxMemInit(VOID) PVOID MembaseTop = (PVOID)(64 * 1024 * 1024); PVOID MembaseLow = (PVOID)0; - (*(PULONG)(0xfd000000 + 0x100200)) = 0x03070103; - (*(PULONG)(0xfd000000 + 0x100204)) = 0x11448000; + WRITE_REGISTER_ULONG((PULONG)NV2A_FB_CFG0, 0x03070103); + WRITE_REGISTER_ULONG((PULONG)NV2A_FB_CFG0 + 4, 0x11448000); - WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); - WRITE_PORT_ULONG((ULONG*) 0xcfc, 0x7ffffff); /* Prep hardware for 128 Mb */ + /* Prep hardware for 128 Mb */ + WRITE_PORT_ULONG((PULONG)0xCF8, CONFIG_CMD(0, 0, 0x84)); + WRITE_PORT_ULONG((PULONG)0xCFC, 0x7FFFFFF); InstalledMemoryMb = 64; memset(ControlRegion, TEST_PATTERN1, TEST_SIZE); @@ -93,8 +94,8 @@ XboxMemInit(VOID) } /* Set hardware for amount of memory detected */ - WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); - WRITE_PORT_ULONG((ULONG*) 0xcfc, InstalledMemoryMb * 1024 * 1024 - 1); + WRITE_PORT_ULONG((PULONG)0xCF8, CONFIG_CMD(0, 0, 0x84)); + WRITE_PORT_ULONG((PULONG)0xCFC, InstalledMemoryMb * 1024 * 1024 - 1); AvailableMemoryMb = InstalledMemoryMb; } diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 6a95fe6025d..3f41e848666 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -38,6 +38,8 @@ #define LPC_CONFIG_DEVICE_INTERRUPT 0x70 #define NV2A_CONTROL_OFFSET 0xFD000000 +#define NV2A_FB_OFFSET (0x100000 + NV2A_CONTROL_OFFSET) +#define NV2A_FB_CFG0 (0x200 + NV2A_FB_OFFSET) #define NV2A_CRTC_OFFSET (0x600000 + NV2A_CONTROL_OFFSET) #define NV2A_CRTC_FRAMEBUFFER_START (0x800 + NV2A_CRTC_OFFSET) #define NV2A_CRTC_REGISTER_INDEX (0x13D4 + NV2A_CRTC_OFFSET)

1 0

[reactos] 01/01: [ISAPNP] Enable driver
by Hervé Poussineau 08 May '20

08 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49040fa54c1493752e39a… commit 49040fa54c1493752e39a12b7d7a3cae44860219 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri May 8 20:00:58 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri May 8 20:02:36 2020 +0200 [ISAPNP] Enable driver --- boot/bootdata/txtsetup.sif | 4 ++-- media/inf/machine.inf | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 02116f3e039..9c1bcc410eb 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -148,11 +148,11 @@ mountmgr.sys = 1,,,,,,x,4,,,,1,4 [SystemPartitionFiles] [HardwareIdsDatabase] -;*PNP0A00 = isapnp +*PNP0A00 = isapnp *PNP0A03 = pci *PNP0A08 = pci *PNP0C08 = acpi -;PCI\CC_0601 = isapnp +PCI\CC_0601 = isapnp PCI\CC_0604 = pci PCI\VEN_104B&CC_0100 = buslogic PCI\CC_0101 = pciide diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 69ac0b92b25..744907fed7b 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -116,8 +116,7 @@ CopyFiles = PCI_ISA_CopyFiles.NT isapnp.sys [PCI_ISA_Inst.NT.Services] -;AddService = isapnp, 0x00000002, isapnp_Service_Inst -AddService = , 0x00000002 +AddService = isapnp, 0x00000002, isapnp_Service_Inst [isapnp_Service_Inst] ServiceType = 1

1 0

[reactos] 01/01: [UTILMAN] Use the ShellAboutW API routine to display the about dialog (#2743)
by George Bișoc 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c804322686fb9ca7a57d… commit 2c804322686fb9ca7a57df21769ba8b6157e9138 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Thu May 7 13:01:36 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 13:01:36 2020 +0200 [UTILMAN] Use the ShellAboutW API routine to display the about dialog (#2743) In addition to that, add the missing function prototypes in the DLL dialog header of Utilman, add missing IN/OUT annotations and remove CheckUtilityState() prototype which is barely used (it's not implemented either). --- base/applications/utilman/umandlg/CMakeLists.txt | 1 - base/applications/utilman/umandlg/about.c | 92 ------------------------ base/applications/utilman/umandlg/lang/en-US.rc | 12 +--- base/applications/utilman/umandlg/lang/es-ES.rc | 12 +--- base/applications/utilman/umandlg/lang/fr-FR.rc | 12 +--- base/applications/utilman/umandlg/lang/he-IL.rc | 12 +--- base/applications/utilman/umandlg/lang/it-IT.rc | 12 +--- base/applications/utilman/umandlg/lang/pl-PL.rc | 12 +--- base/applications/utilman/umandlg/lang/ro-RO.rc | 12 +--- base/applications/utilman/umandlg/lang/ru-RU.rc | 12 +--- base/applications/utilman/umandlg/lang/uk-UA.rc | 12 +--- base/applications/utilman/umandlg/resource.h | 5 +- base/applications/utilman/umandlg/umandlg.c | 25 ++++++- base/applications/utilman/umandlg/umandlg.h | 13 ++-- 14 files changed, 52 insertions(+), 192 deletions(-) diff --git a/base/applications/utilman/umandlg/CMakeLists.txt b/base/applications/utilman/umandlg/CMakeLists.txt index e2b0a0a9e4b..91ae1067166 100644 --- a/base/applications/utilman/umandlg/CMakeLists.txt +++ b/base/applications/utilman/umandlg/CMakeLists.txt @@ -2,7 +2,6 @@ spec2def(umandlg.dll umandlg.spec) add_library(umandlg MODULE - about.c process.c registry.c umandlg.c diff --git a/base/applications/utilman/umandlg/about.c b/base/applications/utilman/umandlg/about.c deleted file mode 100644 index ea66987296a..00000000000 --- a/base/applications/utilman/umandlg/about.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll) - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: About dialog file - * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) - */ - -/* INCLUDES *******************************************************************/ - -#include "umandlg.h" - -/* GLOBALS ********************************************************************/ - -UTILMAN_GLOBALS Globals; - -/* FUNCTIONS ******************************************************************/ - -/** - * @AboutDlgProc - * - * "About" dialog procedure. - * - * @param hDlg - * The handle object of the dialog. - * - * @param Msg - * Message events (in unsigned int). - * - * @param wParam - * Message parameter (in UINT_PTR). - * - * @param lParam - * Message paramater (in LONG_PTR). - * - * @return - * Return TRUE if the dialog processed messages, - * FALSE otherwise. - * - */ -INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - switch (Msg) - { - case WM_INITDIALOG: - { - WCHAR szAppPath[MAX_BUFFER]; - - /* Extract the icon resource from the executable process */ - GetModuleFileNameW(NULL, szAppPath, _countof(szAppPath)); - Globals.hIcon = ExtractIconW(Globals.hInstance, szAppPath, 0); - - /* Set the icon within the dialog's title bar */ - if (Globals.hIcon) - { - SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hIcon); - } - - return TRUE; - } - - case WM_COMMAND: - { - case IDOK: - case IDCANCEL: - DestroyIcon(Globals.hIcon); - EndDialog(hDlg, FALSE); - break; - } - } - - return FALSE; -} - -/** - * @ShowAboutDlg - * - * Display the "About" dialog. - * - * @param hDlgParent - * The handle object of the parent dialog. - * - * @return - * Nothing. - */ -VOID ShowAboutDlg(HWND hDlgParent) -{ - /* Display the "About" dialog when the user clicks on the "About" menu item */ - DialogBoxW(Globals.hInstance, - MAKEINTRESOURCEW(IDD_ABOUT_DIALOG), - hDlgParent, - AboutDlgProc); -} diff --git a/base/applications/utilman/umandlg/lang/en-US.rc b/base/applications/utilman/umandlg/lang/en-US.rc index dcaa3a2395d..d44bc44cd3a 100644 --- a/base/applications/utilman/umandlg/lang/en-US.rc +++ b/base/applications/utilman/umandlg/lang/en-US.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&Help", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "About Accessibility Utility Manager" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "On-Screen Keyboard" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "About Accessibility Utility Manager..." + IDS_APP_NAME "Accessibility Utility Manager" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/es-ES.rc b/base/applications/utilman/umandlg/lang/es-ES.rc index 8b7ade86373..bbf3e57d57c 100644 --- a/base/applications/utilman/umandlg/lang/es-ES.rc +++ b/base/applications/utilman/umandlg/lang/es-ES.rc @@ -26,16 +26,6 @@ BEGIN CONTROL "&Ayuda", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "Acerca de las Herramientas de Accesibilidad" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Cerrar", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Teclado en Pantalla" @@ -52,4 +42,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "Acerca de las Herramientas de Accesibilidad..." + IDS_APP_NAME "Herramientas de Accesibilidad" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/fr-FR.rc b/base/applications/utilman/umandlg/lang/fr-FR.rc index 71368f2c0d2..d80ebc05235 100644 --- a/base/applications/utilman/umandlg/lang/fr-FR.rc +++ b/base/applications/utilman/umandlg/lang/fr-FR.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&Aide", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "A propos du gestionnaire d'utilitaires d'accessibilité" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Clavier visuel" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "A propos du gestionnaire d'utilitaires d'accessibilité..." + IDS_APP_NAME "Gestionnaire d'utilitaires d'accessibilité" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/he-IL.rc b/base/applications/utilman/umandlg/lang/he-IL.rc index 4f381ba3530..f9f918222e0 100644 --- a/base/applications/utilman/umandlg/lang/he-IL.rc +++ b/base/applications/utilman/umandlg/lang/he-IL.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&עזרה", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "אודות מנהל כלי הנגישות" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "סגור", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "לוח מקשים על התצוגה" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "אודות מנהל כלי הנגישות..." + IDS_APP_NAME "מנהל כלי הנגישות" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/it-IT.rc b/base/applications/utilman/umandlg/lang/it-IT.rc index b36ec0577e7..a8ba5478ea4 100644 --- a/base/applications/utilman/umandlg/lang/it-IT.rc +++ b/base/applications/utilman/umandlg/lang/it-IT.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "?", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "Informazioni su Accessibilità Utility Manager" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Chiudi", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Tastiera su schermo" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "Informazioni su Accessibilità Utility Manager..." + IDS_APP_NAME "Accessibilità Utility Manager" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/pl-PL.rc b/base/applications/utilman/umandlg/lang/pl-PL.rc index 76d82e75514..10a9d042d9d 100644 --- a/base/applications/utilman/umandlg/lang/pl-PL.rc +++ b/base/applications/utilman/umandlg/lang/pl-PL.rc @@ -24,16 +24,6 @@ BEGIN CONTROL "&Pomoc", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "Menedżer narzędzi ułatwienia dostępu - informacje" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Menedżer narzędzi ułatwienia dostępu\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Klawiatura ekranowa" @@ -50,4 +40,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "O programie Menedżer narzędzi ułatwienia dostępu..." + IDS_APP_NAME "Menedżer narzędzi ułatwienia dostępu" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/ro-RO.rc b/base/applications/utilman/umandlg/lang/ro-RO.rc index 5cb51134aa2..10f357e9eba 100644 --- a/base/applications/utilman/umandlg/lang/ro-RO.rc +++ b/base/applications/utilman/umandlg/lang/ro-RO.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&Ajutor", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "Despre Managerul utilitare" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "Închide", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Tastatură virtuală" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "Despre Managerul utilitare..." + IDS_APP_NAME "Manager utilitare" + IDS_AUTHORS "Drept de autor 2019 George Bișoc, Hermes Belusca-Maito" END diff --git a/base/applications/utilman/umandlg/lang/ru-RU.rc b/base/applications/utilman/umandlg/lang/ru-RU.rc index c57d4be4169..a797b13c517 100644 --- a/base/applications/utilman/umandlg/lang/ru-RU.rc +++ b/base/applications/utilman/umandlg/lang/ru-RU.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&Справка", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "О программе" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "OK", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Экранная клавиатура" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "О программе" + IDS_APP_NAME "Диспетчер служебных программ" + IDS_AUTHORS "© 2019 Джордж Бисок, Гермес Белуска-Майто" END diff --git a/base/applications/utilman/umandlg/lang/uk-UA.rc b/base/applications/utilman/umandlg/lang/uk-UA.rc index d13c862c279..0ce31dc1aba 100644 --- a/base/applications/utilman/umandlg/lang/uk-UA.rc +++ b/base/applications/utilman/umandlg/lang/uk-UA.rc @@ -25,16 +25,6 @@ BEGIN CONTROL "&Довідка", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 END -IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 -CAPTION "Про программу" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Диспетчер службових програм\n© 2019 Джордж Бісок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36 - LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36 - PUSHBUTTON "OK", IDOK, 75, 47, 44, 15 -END - STRINGTABLE BEGIN IDS_OSK "Екранна клавіатура" @@ -51,4 +41,6 @@ END STRINGTABLE BEGIN IDM_ABOUT "Про программу" + IDS_APP_NAME "Диспетчер службових програм" + IDS_AUTHORS "© 2019 Джордж Бісок, Гермес Белуска-Майто" END diff --git a/base/applications/utilman/umandlg/resource.h b/base/applications/utilman/umandlg/resource.h index d980b983a7e..5d04ba3c1c7 100644 --- a/base/applications/utilman/umandlg/resource.h +++ b/base/applications/utilman/umandlg/resource.h @@ -39,6 +39,9 @@ /* System menu (About) resource */ #define IDM_ABOUT 600 +/* About resource strings */ +#define IDS_APP_NAME 700 +#define IDS_AUTHORS 701 + /* Main dialog resource */ #define IDD_MAIN_DIALOG 1000 -#define IDD_ABOUT_DIALOG 1050 diff --git a/base/applications/utilman/umandlg/umandlg.c b/base/applications/utilman/umandlg/umandlg.c index 0902f3b972f..f1a9a72ce67 100644 --- a/base/applications/utilman/umandlg/umandlg.c +++ b/base/applications/utilman/umandlg/umandlg.c @@ -35,7 +35,7 @@ UTILMAN_STATE EntriesList[] = * @return * Nothing. */ -VOID InitUtilsList(BOOL bInitGui) +VOID InitUtilsList(IN BOOL bInitGui) { UINT i; @@ -152,6 +152,29 @@ BOOL DlgInitHandler(IN HWND hDlg) return TRUE; } +/** + * @ShowAboutDlg + * + * Displays the Shell "About" dialog box. + * + * @param[in] hDlgParent + * A handle to the parent dialog window. + * + * @return + * Nothing. + * + */ +VOID ShowAboutDlg(IN HWND hDlgParent) +{ + WCHAR szApp[MAX_BUFFER]; + WCHAR szAuthors[MAX_BUFFER]; + + LoadStringW(Globals.hInstance, IDS_APP_NAME, szApp, _countof(szApp)); + LoadStringW(Globals.hInstance, IDS_AUTHORS, szAuthors, _countof(szAuthors)); + + ShellAboutW(hDlgParent, szApp, szAuthors, Globals.hIcon); +} + /** * @GroupBoxUpdateTitle * diff --git a/base/applications/utilman/umandlg/umandlg.h b/base/applications/utilman/umandlg/umandlg.h index 6705761239b..b7548cc972e 100644 --- a/base/applications/utilman/umandlg/umandlg.h +++ b/base/applications/utilman/umandlg/umandlg.h @@ -90,10 +90,13 @@ typedef enum _WRITE_REGISTRY /* DECLARATIONS ***************************************************************/ /* umandlg.c */ -BOOL DlgInitHandler(HWND hDlg); -INT_PTR APIENTRY DlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +VOID InitUtilsList(IN BOOL bInitGui); +BOOL DlgInitHandler(IN HWND hDlg); +VOID ShowAboutDlg(IN HWND hDlgParent); +VOID GroupBoxUpdateTitle(VOID); +VOID UpdateUtilityState(IN BOOL bUtilState); +INT_PTR APIENTRY DlgProc(IN HWND hDlg, IN UINT Msg, IN WPARAM wParam, IN LPARAM lParam); INT ListBoxRefreshContents(VOID); -VOID CheckUtilityState(BOOL bUtilState); BOOL WINAPI UManStartDlg(VOID); /* process.c */ @@ -102,10 +105,6 @@ BOOL IsProcessRunning(IN LPCWSTR lpszProcessName); BOOL LaunchProcess(IN LPCWSTR lpszProcessName); BOOL CloseProcess(IN LPCWSTR lpszProcessName); -/* about.c */ -VOID ShowAboutDlg(HWND hDlgParent); -INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); - /* registry.c */ BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition); BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpszSubKey, IN LPCWSTR lpszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData);

1 0

[reactos] 01/01: [APISETS] api-ms-win-core-winrt-l1-1-0: Ro*() are NT8+ (#2739)
by Serge Gautherie 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02825c20e4f94d7b9f0e7… commit 02825c20e4f94d7b9f0e7a1e5941ab415aeadb22 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu May 7 13:00:10 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 13:00:10 2020 +0200 [APISETS] api-ms-win-core-winrt-l1-1-0: Ro*() are NT8+ (#2739) (Supersedes PR #2374.) CORE-16707 --- dll/apisets/api-ms-win-core-winrt-l1-1-0.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/apisets/api-ms-win-core-winrt-l1-1-0.spec b/dll/apisets/api-ms-win-core-winrt-l1-1-0.spec index 5d906d8bd68..1c4aa69143f 100644 --- a/dll/apisets/api-ms-win-core-winrt-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-winrt-l1-1-0.spec @@ -1,12 +1,12 @@ # This file is autogenerated by update.py -@ stub RoActivateInstance -@ stub RoGetActivationFactory -@ stub RoGetApartmentIdentifier -@ stub RoInitialize -@ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown -@ stub RoRevokeActivationFactories -@ stub RoUninitialize -@ stub RoUnregisterForApartmentShutdown +@ stub -version=0x602+ RoActivateInstance +@ stub -version=0x602+ RoGetActivationFactory +@ stub -version=0x602+ RoGetApartmentIdentifier +@ stub -version=0x602+ RoInitialize +@ stub -version=0x602+ RoRegisterActivationFactories +@ stub -version=0x602+ RoRegisterForApartmentShutdown +@ stub -version=0x602+ RoRevokeActivationFactories +@ stub -version=0x602+ RoUninitialize +@ stub -version=0x602+ RoUnregisterForApartmentShutdown

1 0

[reactos] 01/01: [SYSDM][DESK] Fix GetDC/ReleaseDC error management (#2707)
by Kyle Katarn 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d635ce0cc0336a9b77d24… commit d635ce0cc0336a9b77d243ddce946876f48ec4f6 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu May 7 12:57:46 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 12:57:46 2020 +0200 [SYSDM][DESK] Fix GetDC/ReleaseDC error management (#2707) ## Purpose [SYSDM] - When closing System Properties page, log show (win32ss/user/ntuser/windc.c:749) err: [00060138] GetDC() without ReleaseDC()! because GetDC() is called (multiple times) without properly calling ReleaseDC() as required in order to release a device context. - This module also lacks some error management in case null DC are provided (on error). - LiveCD Userinit, based on SYSDM is affected too. [DESK] - Fix missing ReleaseDC related to the spectrum (color depth) ## Proposed changes - ReleaseDC() added. - Error management in case of null DC. - Overall alignement of LiveCD Userinit and SYSDM. --- base/system/userinit/livecd.c | 14 +++-- dll/cpl/desk/settings.c | 6 ++- dll/cpl/sysdm/general.c | 115 ++++++++++++++++++++++++------------------ 3 files changed, 80 insertions(+), 55 deletions(-) diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index 57b031a716b..e4940bcade0 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -34,6 +34,9 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) COLORREF *pBits; INT line, column; + if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL) + goto Cleanup; + ZeroMemory(pImgInfo, sizeof(*pImgInfo)); ZeroMemory(&bmpi, sizeof(bmpi)); @@ -76,7 +79,7 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) g = GetGValue(Color) * alpha / 255; b = GetBValue(Color) * alpha / 255; - *pBits++ = b | g << 8 | r << 16 | alpha << 24; + *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24); } } @@ -88,10 +91,11 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) } Cleanup: - DeleteObject(hMask); - DeleteObject(hLogo); - DeleteDC(hDCMask); - DeleteDC(hDCLogo); + if (hMask != NULL) DeleteObject(hMask); + if (hLogo != NULL) DeleteObject(hLogo); + if (hDCMask != NULL) DeleteDC(hDCMask); + if (hDCLogo != NULL) DeleteDC(hDCLogo); + if (hDC != NULL) ReleaseDC(hwndDlg, hDC); } diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index c8d4761a05a..300ef616853 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -5,7 +5,7 @@ * PURPOSE: Settings property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ #include "desk.h" @@ -472,8 +472,12 @@ OnBPPChanged(IN HWND hwndDlg, IN PSETTINGS_DATA pData) /* Show a new spectrum bitmap */ hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM); hSpectrumDC = GetDC(hSpectrumControl); + if (hSpectrumDC == NULL) + return; + GetClientRect(hSpectrumControl, &client); ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData); + ReleaseDC(hSpectrumControl, hSpectrumDC); /* Find if new parameters are valid */ Current = pData->CurrentDisplayDevice->CurrentSettings; diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 68436639e19..d56677574fe 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -69,22 +69,22 @@ static VOID InitLogo(HWND hwndDlg) COLORREF *pBits; INT line, column; + if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL) + goto Cleanup; + ZeroMemory(pImgInfo, sizeof(*pImgInfo)); ZeroMemory(&bmpi, sizeof(bmpi)); - hLogo = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - hMask = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hLogo = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hMask = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hLogo != NULL && hMask != NULL) { - GetObject(hLogo, sizeof(BITMAP), &logoBitmap); - GetObject(hMask, sizeof(BITMAP), &maskBitmap); + GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); + GetObject(hMask, sizeof(maskBitmap), &maskBitmap); - if(logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) - return; - - pImgInfo->cxSource = logoBitmap.bmWidth; - pImgInfo->cySource = logoBitmap.bmHeight; + if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) + goto Cleanup; bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; @@ -94,17 +94,17 @@ static VOID InitLogo(HWND hwndDlg) bmpi.bmiHeader.biCompression = BI_RGB; bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + /* Create a premultiplied bitmap */ hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); - - if(!hAlphaLogo) - return; + if (!hAlphaLogo) + goto Cleanup; SelectObject(hDCLogo, hLogo); SelectObject(hDCMask, hMask); - for(line = logoBitmap.bmHeight - 1; line >= 0; line--) + for (line = logoBitmap.bmHeight - 1; line >= 0; line--) { - for(column = 0; column < logoBitmap.bmWidth; column++) + for (column = 0; column < logoBitmap.bmWidth; column++) { COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF; COLORREF Color = GetPixel(hDCLogo, column, line); @@ -114,22 +114,23 @@ static VOID InitLogo(HWND hwndDlg) g = GetGValue(Color) * alpha / 255; b = GetBValue(Color) * alpha / 255; - *pBits++ = b | g << 8 | r << 16 | alpha << 24; + *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24); } - } - } - - pImgInfo->hBitmap = hAlphaLogo; - pImgInfo->cxSource = logoBitmap.bmWidth; - pImgInfo->cySource = logoBitmap.bmHeight; - pImgInfo->iBits = logoBitmap.bmBitsPixel; - pImgInfo->iPlanes = logoBitmap.bmPlanes; + } - DeleteObject(hLogo); - DeleteObject(hMask); - DeleteDC(hDCLogo); - DeleteDC(hDCMask); + pImgInfo->hBitmap = hAlphaLogo; + pImgInfo->cxSource = logoBitmap.bmWidth; + pImgInfo->cySource = logoBitmap.bmHeight; + pImgInfo->iBits = logoBitmap.bmBitsPixel; + pImgInfo->iPlanes = logoBitmap.bmPlanes; + } +Cleanup: + if (hMask != NULL) DeleteObject(hMask); + if (hLogo != NULL) DeleteObject(hLogo); + if (hDCMask != NULL) DeleteDC(hDCMask); + if (hDCLogo != NULL) DeleteDC(hDCLogo); + if (hDC != NULL) ReleaseDC(hwndDlg, hDC); } LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -145,19 +146,23 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (timerid == 0) { HDC hCreditsDC, hLogoDC; - HFONT hFont; + HDC hDC = GetDC(NULL); + HFONT hFont = NULL; NONCLIENTMETRICS ncm; RECT rcCredits; TCHAR szCredits[2048]; INT iDevsHeight; - top = 0; + if (hDC == NULL) + goto Cleanup; + + top = 0; offset = 0; - hCreditsDC = CreateCompatibleDC(GetDC(NULL)); + hCreditsDC = CreateCompatibleDC(hDC); hLogoDC = CreateCompatibleDC(hCreditsDC); if (hCreditsDC == NULL || hLogoDC == NULL) - break; + goto Cleanup; SetRect(&rcCredits, 0, 0, 0, 0); @@ -165,6 +170,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); hFont = CreateFontIndirect(&ncm.lfMessageFont); + if (!hFont) + goto Cleanup; SelectObject(hCreditsDC, hFont); LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR)); @@ -174,8 +181,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); - if(!hCreditsBitmap) - break; + if (!hCreditsBitmap) + goto Cleanup; SelectObject(hLogoDC, pImgInfo->hBitmap); SelectObject(hCreditsDC, hCreditsBitmap); @@ -201,10 +208,13 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc); - DeleteDC(hLogoDC); - DeleteDC(hCreditsDC); - timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); + +Cleanup: + if (hFont != NULL) DeleteObject(hFont); + if (hLogoDC != NULL) DeleteDC(hLogoDC); + if (hCreditsDC != NULL) DeleteDC(hCreditsDC); + if (hDC != NULL) ReleaseDC(NULL, hDC); } } break; @@ -213,18 +223,22 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { RECT rcCredits; HDC hDC = GetDC(hwnd); - - GetClientRect(hwnd, &rcCredits); - SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); - FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); - + if (hDC != NULL) + { + GetClientRect(hwnd, &rcCredits); + SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); + FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); + ReleaseDC(hwnd, hDC); + } KillTimer(hwnd, timerid); - DeleteObject(hCreditsBitmap); - InvalidateRect(hwnd, NULL, FALSE); + if (hCreditsBitmap != NULL) + DeleteObject(hCreditsBitmap); top = 0; timerid = 0; } + + InvalidateRect(hwnd, NULL, FALSE); break; case WM_TIMER: top += ANIM_STEP; @@ -233,13 +247,16 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { RECT rcCredits; HDC hDC = GetDC(hwnd); - - GetClientRect(hwnd, &rcCredits); - SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); - FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); - + if (hDC != NULL) + { + GetClientRect(hwnd, &rcCredits); + SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource); + FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE)); + ReleaseDC(hwnd, hDC); + } KillTimer(hwnd, timerid); - DeleteObject(hCreditsBitmap); + if (hCreditsBitmap != NULL) + DeleteObject(hCreditsBitmap); top = 0; timerid = 0;

1 0

[reactos] 01/01: [CREDITS] Add myself to the credits document (#2747)
by George Bișoc 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ca52142b6265ae07a730… commit 9ca52142b6265ae07a7300df090a51b1edf36629 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Thu May 7 12:39:44 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 12:39:44 2020 +0200 [CREDITS] Add myself to the credits document (#2747) --- CREDITS | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS b/CREDITS index f085df8cc22..059871b6893 100644 --- a/CREDITS +++ b/CREDITS @@ -28,6 +28,7 @@ Filip Navara <xnavara(a)volny.cz> Frederik Leemans Ge van Geldorp <ge(a)gse.nl> Ged Murphy <gedmurphy(a)reactos.org> +George Bisoc <george.bisoc(a)reactos.org> Giannis Adamopoulos <gadamopoulos(a)reactos.org> Gregor Brunmar <gregor brunmar at home se> Gregor Schneider <grschneider(a)gmail.com>

1 0

[reactos] 01/01: [RAPPS] 64bit compatibility fix (#2748)
by He Yang 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7b111f5503e216bbcbb3… commit a7b111f5503e216bbcbb3c0070c2ff2fa112aa34 Author: He Yang <1160386205(a)qq.com> AuthorDate: Thu May 7 17:08:08 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 18:08:08 2020 +0900 [RAPPS] 64bit compatibility fix (#2748) Change SetWindowLongW to SetWindowLongPtrW. It's the same (because the value is 0) but I think it's better. --- base/applications/rapps/loaddlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index b40d69288f7..69d4ecdc93b 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -404,7 +404,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); } - SetWindowLongW(Dlg, GWLP_USERDATA, 0); + SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); HWND Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) {

1 0

[reactos] 01/01: [PCIIDEX] Increase command port length to 8 from 7. CORE-9922 (#2711)
by Serge Gautherie 07 May '20

07 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ae1702a16a290fc1025c… commit 8ae1702a16a290fc1025cdd5214efaec861d6f5b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu May 7 09:16:18 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 7 10:16:18 2020 +0300 [PCIIDEX] Increase command port length to 8 from 7. CORE-9922 (#2711) Co-Authored-By: Vadim Galyant <vgal(a)rambler.ru> --- drivers/storage/ide/pciidex/pdo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/storage/ide/pciidex/pdo.c b/drivers/storage/ide/pciidex/pdo.c index c82d9d7feaa..7289cd44001 100644 --- a/drivers/storage/ide/pciidex/pdo.c +++ b/drivers/storage/ide/pciidex/pdo.c @@ -257,10 +257,10 @@ PciIdeXPdoQueryResourceRequirements( Descriptor->Flags = CM_RESOURCE_PORT_IO | CM_RESOURCE_PORT_16_BIT_DECODE | CM_RESOURCE_PORT_POSITIVE_DECODE; - Descriptor->u.Port.Length = 7; + Descriptor->u.Port.Length = 8; Descriptor->u.Port.Alignment = 1; Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)CommandPortBase; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(CommandPortBase + 7 - 1); + Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(CommandPortBase + Descriptor->u.Port.Length - 1); Descriptor++; /* Control port base */ @@ -273,7 +273,7 @@ PciIdeXPdoQueryResourceRequirements( Descriptor->u.Port.Length = 1; Descriptor->u.Port.Alignment = 1; Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)ControlPortBase; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(ControlPortBase + 1 - 1); + Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(ControlPortBase + Descriptor->u.Port.Length - 1); Descriptor++; /* Interrupt */

1 0

[reactos] 01/01: [FREELDR] Workaround regression CORE-16469
by Joachim Henze 06 May '20

06 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c81fb8f568c0dc875018… commit 7c81fb8f568c0dc875018fa382d215c088eb839d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed May 6 23:44:50 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed May 6 23:45:37 2020 +0200 [FREELDR] Workaround regression CORE-16469 This prevents ReactOS asserting when 'My computer' is opened, while it tries to send commands to floppy drive. Many thanks to patches author Doug Lyons. The regression was introduced by 0.4.13-dev-1081-g eeff926ede1b2109bb0e129a960b74f3261cf2f1 patch was committed to 0.4.13rls and 0.4.14rls as well. Today it was committed to master as well, as the initially planned investigation for the root cause did still not happen and we can not afford the time to retest and workaround this over and over again. Thank god that Oleg Dubinskiy was still around to retest this again and confirmed it can still happen, because unlike initially, personally I was not able to reproduce it today anymore! Since every release was work-arounded, we did never expose the bug in any final release. --- boot/freeldr/freeldr/arch/i386/pc/pcdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c index 37058bced70..550c424d15d 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c @@ -790,7 +790,7 @@ PcDiskReadLogicalSectors( #if defined(__i386__) || defined(_M_AMD64) VOID __cdecl DiskStopFloppyMotor(VOID) { - WRITE_PORT_UCHAR((PUCHAR)0x3F2, 0x0C); // DOR_FDC_ENABLE | DOR_DMA_IO_INTERFACE_ENABLE + WRITE_PORT_UCHAR((PUCHAR)0x3F2, 0); // DOR_FDC_ENABLE | DOR_DMA_IO_INTERFACE_ENABLE 0x0C // we changed 0x0C->0 to workaround CORE-16469 } #endif // defined __i386__ || defined(_M_AMD64)

1 0

[reactos] 01/01: [README] "Building ReactOS" belongs to "Building" part (#2741)
by Alexander Rechitskiy 06 May '20

06 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68ed29b41f3865388684b… commit 68ed29b41f3865388684b0f36e3a10123c68de78 Author: Alexander Rechitskiy <rechitskiy(a)reactos.org> AuthorDate: Wed May 6 14:14:41 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 6 14:14:41 2020 +0300 [README] "Building ReactOS" belongs to "Building" part (#2741) - Improved logic of the text - Removed some line breaks to improve readability on some screen sizes --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8ef9eb7868a..e6acf3d7bfc 100644 --- a/README.md +++ b/README.md @@ -55,16 +55,15 @@ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our do Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). +See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details. + ### Binaries To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja <modulename>` to build a module you want or just `ninja` to build all modules. ### Bootable images -To build a bootable CD image run `ninja bootcd` from the -build directory. This will create a CD image with a filename `bootcd.iso`. - -See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) for more details. +To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`. You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page. @@ -74,9 +73,7 @@ By default, ReactOS currently can only be installed on a machine that has a FAT1 The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if needed. -Starting 0.4.10, ReactOS can be installed using the BtrFS file system. But -consider this as an experimental feature and thus regressions not triggered on -FAT setup may be observed. +Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed. To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions.

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