Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [RAPPS] 64bit compatibility fix (#2748)

by He Yang

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) {

4 years, 7 months

[reactos] 01/01: [PCIIDEX] Increase command port length to 8 from 7. CORE-9922 (#2711)

by Serge Gautherie

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 */

4 years, 7 months

[reactos] 01/01: [FREELDR] Workaround regression CORE-16469

by Joachim Henze

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)

4 years, 7 months

[reactos] 01/01: [README] "Building ReactOS" belongs to "Building" part (#2741)

by Alexander Rechitskiy

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.

4 years, 7 months

[reactos] 01/01: [README] Update RosBE links and badges to version 2.2.0 (#2742)

by Alexander Rechitskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7abc22c383007e510df6f… commit 7abc22c383007e510df6f40c468df52e8906b608 Author: Alexander Rechitskiy <rechitskiy(a)reactos.org> AuthorDate: Wed May 6 14:02:30 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 6 14:02:30 2020 +0300 [README] Update RosBE links and badges to version 2.2.0 (#2742) https://reactos.org/project-news/rosbe-22-released/ --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a200f9a5dc1..8ef9eb7868a 100644 --- a/README.md +++ b/README.md @@ -125,10 +125,10 @@ The main development is done on [GitHub](https://github.com/reactos/reactos). We There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes. [coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1 -[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.1.6-0688CB.svg -[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.1.2-0688CB.svg +[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg +[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg [prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg [coverity.link]: https://scan.coverity.com/projects/205 -[rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.6/ -[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/ +[rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/ +[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/

4 years, 7 months

[reactos] 01/01: [USERINIT] Add unattend.inf functionality to livecd

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0e32d4f48b93907f6cca… commit a0e32d4f48b93907f6cca87b5ed4affd385d592c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun May 3 20:18:30 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue May 5 20:54:30 2020 +0200 [USERINIT] Add unattend.inf functionality to livecd --- base/system/userinit/livecd.c | 84 ++++++++++++++++++++++++++++++++++++--- base/system/userinit/userinit.h | 1 + boot/bootdata/CMakeLists.txt | 1 + boot/bootdata/livecd/.keep | 0 boot/bootdata/livecd/unattend.inf | 13 ++++++ 5 files changed, 94 insertions(+), 5 deletions(-) diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index 86d3eb70fc2..57b031a716b 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -11,6 +11,13 @@ HWND hList; HWND hLocaleList; BOOL bSpain = FALSE; +typedef struct _LIVECD_UNATTEND +{ + BOOL bEnabled; + LCID LocaleID; +} LIVECD_UNATTEND; + + /* * Taken and adapted from dll/cpl/sysdm/general.c */ @@ -158,6 +165,7 @@ LocalesEnumProc(LPTSTR lpLocale) if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; + // See http://archives.miloush.net/michkap/archive/2006/09/23/768178.html for why we handle spain differently if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) { @@ -194,17 +202,25 @@ LocalesEnumProc(LPTSTR lpLocale) static VOID -CreateLanguagesList(HWND hwnd) +CreateLanguagesList(HWND hwnd, PSTATE pState) { WCHAR langSel[255]; + LCID Locale = 0; hList = hwnd; bSpain = FALSE; EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); - /* Select current locale */ - /* or should it be System and not user? */ - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, ARRAYSIZE(langSel)); + if (pState->Unattend->bEnabled) + Locale = pState->Unattend->LocaleID; + + if (!Locale) + { + /* Select current locale */ + /* or should it be System and not user? */ + Locale = GetUserDefaultLCID(); + } + GetLocaleInfoW(Locale, LOCALE_SLANGUAGE, langSel, ARRAYSIZE(langSel)); SendMessageW(hList, CB_SELECTSTRING, @@ -618,8 +634,13 @@ LocaleDlgProc( CenterWindow(hwndDlg); /* Fill the language and keyboard layout lists */ - CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST), pState); CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); + if (pState->Unattend->bEnabled) + { + // Advance to the next page + PostMessageW(hwndDlg, WM_COMMAND, MAKELONG(IDOK, BN_CLICKED), 0L); + } return FALSE; case WM_DRAWITEM: @@ -746,6 +767,13 @@ StartDlgProc( /* Center the dialog window */ CenterWindow(hwndDlg); + + if (pState->Unattend->bEnabled) + { + // Click on the 'Run' button + PostMessageW(hwndDlg, WM_COMMAND, MAKELONG(IDC_RUN, BN_CLICKED), 0L); + } + return FALSE; case WM_DRAWITEM: @@ -805,13 +833,59 @@ StartDlgProc( return FALSE; } +VOID ParseUnattend(LPCWSTR UnattendInf, LIVECD_UNATTEND* pUnattend) +{ + WCHAR Buffer[MAX_PATH]; + + pUnattend->bEnabled = FALSE; + + if (!GetPrivateProfileStringW(L"Unattend", L"Signature", L"", Buffer, _countof(Buffer), UnattendInf)) + { + ERR("Unable to parse Signature\n"); + return; + } + + if (_wcsicmp(Buffer, L"$ReactOS$") && _wcsicmp(Buffer, L"$Windows NT$")) + { + TRACE("Unknown signature: %S\n", Buffer); + return; + } + + if (!GetPrivateProfileStringW(L"Unattend", L"UnattendSetupEnabled", L"", Buffer, _countof(Buffer), UnattendInf)) + { + ERR("Unable to parse UnattendSetupEnabled\n"); + return; + } + + if (_wcsicmp(Buffer, L"yes")) + { + TRACE("Unattended setup is not enabled\n", Buffer); + return; + } + + pUnattend->bEnabled = TRUE; + pUnattend->LocaleID = 0; + + if (GetPrivateProfileStringW(L"Unattend", L"LocaleID", L"", Buffer, _countof(Buffer), UnattendInf) && Buffer[0]) + { + pUnattend->LocaleID = wcstol(Buffer, NULL, 16); + } +} VOID RunLiveCD( PSTATE pState) { + LIVECD_UNATTEND Unattend = {0}; + WCHAR UnattendInf[MAX_PATH]; + InitLogo(&pState->ImageInfo, NULL); + GetWindowsDirectoryW(UnattendInf, _countof(UnattendInf)); + wcscat(UnattendInf, L"\\unattend.inf"); + ParseUnattend(UnattendInf, &Unattend); + pState->Unattend = &Unattend; + while (pState->NextPage != DONE) { switch (pState->NextPage) diff --git a/base/system/userinit/userinit.h b/base/system/userinit/userinit.h index 46079756a6c..c34f287d09c 100644 --- a/base/system/userinit/userinit.h +++ b/base/system/userinit/userinit.h @@ -58,6 +58,7 @@ typedef struct PAGESTATE NextPage; RUN Run; IMGINFO ImageInfo; + struct _LIVECD_UNATTEND* Unattend; } STATE, *PSTATE; diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index fd5696b46fe..f1e6153f8a7 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -62,6 +62,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd.ini DESTINATION root NAME_ # Unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd/unattend.inf DESTINATION reactos NO_CAB FOR livecd) # LiveCD shortcuts macro(add_livecd_shortcut name app dest) diff --git a/boot/bootdata/livecd/.keep b/boot/bootdata/livecd/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/boot/bootdata/livecd/unattend.inf b/boot/bootdata/livecd/unattend.inf new file mode 100644 index 00000000000..9336b0ff791 --- /dev/null +++ b/boot/bootdata/livecd/unattend.inf @@ -0,0 +1,13 @@ +[Unattend] +Signature = "$ReactOS$" + +; Set UnattendSetupEnabled to yes in order to boot the livecd immediately to desktop +; yes - unattend setup enabled +; no - unattend setup disabled +UnattendSetupEnabled = no + +; set this option to automatically +; specify language in the language setup +; see hivesys.inf for available languages +LocaleID = 409 +

4 years, 7 months

[reactos] 01/01: [SHELL32] Distinguish floppy and removable drives (#2645)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f3cb13fb97e618b53e55… commit 1f3cb13fb97e618b53e55db0f455fe7259694326 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 6 00:35:01 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 6 00:35:01 2020 +0900 [SHELL32] Distinguish floppy and removable drives (#2645) Distinguish floppy drive and non-floppy removable drive in icon and description. CORE-10221 --- dll/win32/shell32/dialogs/drvdefext.cpp | 106 +++++++++++++++++++++++++++- dll/win32/shell32/folders/CDrivesFolder.cpp | 16 ++++- 2 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp index f65091f55cc..82e8764e835 100644 --- a/dll/win32/shell32/dialogs/drvdefext.cpp +++ b/dll/win32/shell32/dialogs/drvdefext.cpp @@ -3,6 +3,7 @@ * * Copyright 2005 Johannes Anderwald * Copyright 2012 Rafal Harabien + * Copyright 2020 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,10 @@ #define _USE_MATH_DEFINES #include <math.h> +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> + WINE_DEFAULT_DEBUG_CHANNEL(shell); static const GUID GUID_DEVCLASS_DISKDRIVE = {0x4d36e967L, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; @@ -278,6 +283,100 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem) } } +// https://stackoverflow.com/questions/3098696/get-information-about-disk-driv… +static BOOL +GetDriveTypeAndCharacteristics(HANDLE hDevice, DEVICE_TYPE *pDeviceType, ULONG *pCharacteristics) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + FILE_FS_DEVICE_INFORMATION DeviceInfo; + + Status = NtQueryVolumeInformationFile(hDevice, &IoStatusBlock, + &DeviceInfo, sizeof(DeviceInfo), + FileFsDeviceInformation); + if (Status == NO_ERROR) + { + *pDeviceType = DeviceInfo.DeviceType; + *pCharacteristics = DeviceInfo.Characteristics; + return TRUE; + } + + return FALSE; +} + +BOOL IsDriveFloppyW(LPCWSTR pszDriveRoot) +{ + LPCWSTR RootPath = pszDriveRoot; + WCHAR szRoot[16], szDeviceName[16]; + UINT uType; + HANDLE hDevice; + DEVICE_TYPE DeviceType; + ULONG ulCharacteristics; + BOOL ret; + + lstrcpynW(szRoot, RootPath, _countof(szRoot)); + + if (L'a' <= szRoot[0] && szRoot[0] <= 'z') + { + szRoot[0] += ('A' - 'a'); + } + + if ('A' <= szRoot[0] && szRoot[0] <= L'Z' && + szRoot[1] == L':' && szRoot[2] == 0) + { + // 'C:' --> 'C:\' + szRoot[2] = L'\\'; + szRoot[3] = 0; + } + + if (!PathIsRootW(szRoot)) + { + return FALSE; + } + + uType = GetDriveTypeW(szRoot); + if (uType == DRIVE_REMOVABLE) + { + if (szRoot[0] == L'A' || szRoot[0] == L'B') + return TRUE; + } + else + { + return FALSE; + } + + lstrcpynW(szDeviceName, L"\\\\.\\", _countof(szDeviceName)); + szDeviceName[4] = szRoot[0]; + szDeviceName[5] = L':'; + szDeviceName[6] = UNICODE_NULL; + + hDevice = CreateFileW(szDeviceName, FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (hDevice == INVALID_HANDLE_VALUE) + { + return FALSE; + } + + ret = FALSE; + if (GetDriveTypeAndCharacteristics(hDevice, &DeviceType, &ulCharacteristics)) + { + if ((ulCharacteristics & FILE_FLOPPY_DISKETTE) == FILE_FLOPPY_DISKETTE) + ret = TRUE; + } + + CloseHandle(hDevice); + + return ret; +} + +BOOL IsDriveFloppyA(LPCSTR pszDriveRoot) +{ + WCHAR szRoot[8]; + MultiByteToWideChar(CP_ACP, 0, pszDriveRoot, -1, szRoot, _countof(szRoot)); + return IsDriveFloppyW(szRoot); +} + VOID CDrvDefExt::InitGeneralPage(HWND hwndDlg) { @@ -304,7 +403,12 @@ CDrvDefExt::InitGeneralPage(HWND hwndDlg) UINT IconId, TypeStrId = 0; switch (DriveType) { - case DRIVE_REMOVABLE: IconId = IDI_SHELL_3_14_FLOPPY; break; + case DRIVE_REMOVABLE: + if (IsDriveFloppyW(m_wszDrive)) + IconId = IDI_SHELL_3_14_FLOPPY; + else + IconId = IDI_SHELL_REMOVEABLE; + break; case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; TypeStrId = IDS_DRIVE_CDROM; break; case DRIVE_REMOTE: IconId = IDI_SHELL_NETDRIVE; TypeStrId = IDS_DRIVE_NETWORK; break; case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break; diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 53c1b94dbaa..482225ab607 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -449,6 +449,8 @@ getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags, return E_FAIL; } +BOOL IsDriveFloppyA(LPCSTR pszDriveRoot); + HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -476,7 +478,14 @@ HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl } else { - icon_idx = iDriveIconIds[DriveType]; + if (DriveType == DRIVE_REMOVABLE && !IsDriveFloppyA(pszDrive)) + { + icon_idx = IDI_SHELL_REMOVEABLE; + } + else + { + icon_idx = iDriveIconIds[DriveType]; + } initIcon->SetNormalIcon(swShell32Name, -icon_idx); } @@ -1117,7 +1126,10 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S hr = SHSetStrRet(&psd->str, ""); break; case 2: /* type */ - hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); + if (DriveType == DRIVE_REMOVABLE && !IsDriveFloppyA(pszDrive)) + hr = SHSetStrRet(&psd->str, IDS_DRIVE_REMOVABLE); + else + hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); break; case 3: /* total size */ case 4: /* free size */

4 years, 7 months

[reactos] 01/01: [REGEDIT] Fix HeapFree() on the wrong variable (#2736)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0461de33c5de3fee70a00… commit 0461de33c5de3fee70a004b2f9c9e03ca70cfc67 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue May 5 10:44:45 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 5 11:44:45 2020 +0300 [REGEDIT] Fix HeapFree() on the wrong variable (#2736) - When exporting registry keys (to .reg files) some variables from the heap are not free'd while the debug log indicates "HEAP: Trying to free an invalid address". - This is due to the export_registry_key() function that calls HeapFree() for reg_key_name. But this variable is an argument provided by the caller, which is always a statically defined array of WCHAR. - Meanwhile reg_key_name_buf is never free'd and cause a memory leak each time the function gets called. --- base/applications/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index c17221df5ae..41ac7c6be8b 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1392,7 +1392,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) if (file) { fclose(file); } - HeapFree(GetProcessHeap(), 0, reg_key_name); + HeapFree(GetProcessHeap(), 0, reg_key_name_buf); HeapFree(GetProcessHeap(), 0, val_name_buf); HeapFree(GetProcessHeap(), 0, val_buf); HeapFree(GetProcessHeap(), 0, line_buf);

4 years, 7 months

[reactos] 01/01: [ADVAPI32] Remove now-redundant comment (#2735)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9634a3158972e2203edf2… commit 9634a3158972e2203edf21333b1c58718844179c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue May 5 10:37:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 5 11:37:09 2020 +0300 [ADVAPI32] Remove now-redundant comment (#2735) Addendum to 5dfe345. --- dll/win32/advapi32/reg/hkcr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c index 7d714f48388..65fc9e7c92d 100644 --- a/dll/win32/advapi32/reg/hkcr.c +++ b/dll/win32/advapi32/reg/hkcr.c @@ -960,7 +960,6 @@ EnumHKCRValue( NULL); if (ErrorCode != ERROR_SUCCESS) { - /* Most likely ERROR_NO_MORE_ITEMS */ if (ErrorCode != ERROR_NO_MORE_ITEMS) ERR("Returning %d.\n", ErrorCode); goto Exit;

4 years, 7 months

[reactos] 01/01: [ADVAPI32] Fix undue debug print in nominal case (#2734)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dfe3455db5d8c21a3261… commit 5dfe3455db5d8c21a326178006ae8dab9c71fc4b Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon May 4 22:30:36 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 23:30:36 2020 +0300 [ADVAPI32] Fix undue debug print in nominal case (#2734) In current implementation, when regedit opens HKCR root key, an error is logged err:(dll/win32/advapi32/reg/hkcr.c:964) Returning 259. This is not correct as the code 259 is ERROR_NO_MORE_ITEMS which is the nominal return value when end of enumeration is reached. --- dll/win32/advapi32/reg/hkcr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c index 2756685d5fb..7d714f48388 100644 --- a/dll/win32/advapi32/reg/hkcr.c +++ b/dll/win32/advapi32/reg/hkcr.c @@ -961,7 +961,8 @@ EnumHKCRValue( if (ErrorCode != ERROR_SUCCESS) { /* Most likely ERROR_NO_MORE_ITEMS */ - ERR("Returning %d.\n", ErrorCode); + if (ErrorCode != ERROR_NO_MORE_ITEMS) + ERR("Returning %d.\n", ErrorCode); goto Exit; } FallbackValueName[FallbackValueNameLen] = L'\0';

4 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2020