Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [README] Update RosBE links and badges to version 2.2.0 (#2742)
by Alexander Rechitskiy 06 May '20

06 May '20

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/

1 0

[reactos] 01/01: [USERINIT] Add unattend.inf functionality to livecd
by Mark Jansen 05 May '20

05 May '20

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 +

1 0

[reactos] 01/01: [SHELL32] Distinguish floppy and removable drives (#2645)
by Katayama Hirofumi MZ 05 May '20

05 May '20

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

1 0

[reactos] 01/01: [REGEDIT] Fix HeapFree() on the wrong variable (#2736)
by Kyle Katarn 05 May '20

05 May '20

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

1 0

[reactos] 01/01: [ADVAPI32] Remove now-redundant comment (#2735)
by Serge Gautherie 05 May '20

05 May '20

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;

1 0

[reactos] 01/01: [ADVAPI32] Fix undue debug print in nominal case (#2734)
by Kyle Katarn 04 May '20

04 May '20

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';

1 0

[reactos] 01/01: [APISETS] *_seh_filter_*() are NT6+ (#2729)
by Serge Gautherie 04 May '20

04 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f5b0d8890ee30e55294d… commit 8f5b0d8890ee30e55294de532ba708be54ff3cb1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 4 22:26:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 23:26:38 2020 +0300 [APISETS] *_seh_filter_*() are NT6+ (#2729) Addendum to 65fd292. CORE-16700 --- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 2 ++ dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dll/win32/crtdll/crtdll.spec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index aa89729e4d0..7cdd75c7979 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -641,6 +641,8 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ cdecl -version=0x600+ _o__seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0x600+ _o__seh_filter_exe() msvcrt._XcptFilter @ stub _o__set_abort_behavior @ stub _o__set_doserrno @ stub _o__set_errno diff --git a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec index 168f5b949af..261d49ff79c 100644 --- a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec @@ -66,8 +66,8 @@ @ stub _register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ stdcall _resetstkoflw() msvcrt._resetstkoflw -@ cdecl _seh_filter_dll(long ptr) msvcrt.__CppXcptFilter -@ cdecl _seh_filter_exe(long ptr) msvcrt._XcptFilter +@ cdecl -version=0x600+ _seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0x600+ _seh_filter_exe() msvcrt._XcptFilter @ stub _set_abort_behavior @ stub _set_app_type @ stub _set_controlfp diff --git a/dll/win32/crtdll/crtdll.spec b/dll/win32/crtdll/crtdll.spec index 38f2fb36b7b..749140e7faa 100644 --- a/dll/win32/crtdll/crtdll.spec +++ b/dll/win32/crtdll/crtdll.spec @@ -20,7 +20,7 @@ @ cdecl _CItan() msvcrt._CItan @ cdecl _CItanh() msvcrt._CItanh @ extern _HUGE_dll msvcrt._HUGE - @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter + @ cdecl _XcptFilter() msvcrt._XcptFilter @ cdecl __GetMainArgs(ptr ptr ptr long) @ extern __argc_dll msvcrt.__argc @ extern __argv_dll msvcrt.__argv

1 0

[reactos] 01/01: [NETID] Update Polish translation (#2709)
by Adam Stachowicz 04 May '20

04 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4da611ad4b12abc581db6… commit 4da611ad4b12abc581db6dd116eff55b769542bb Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Mon May 4 22:20:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 4 23:20:04 2020 +0300 [NETID] Update Polish translation (#2709) Addendum to c276681. --- dll/win32/netid/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc index f190c528bc1..14d93dedc08 100644 --- a/dll/win32/netid/lang/pl-PL.rc +++ b/dll/win32/netid/lang/pl-PL.rc @@ -28,7 +28,7 @@ BEGIN PUSHBUTTON "Z&mień...", IDC_NETWORK_PROPERTY, 167, 149, 82, 14 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE - LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8 + LTEXT "Zmiany zostaną zastosowane po ponownym uruchomieniu komputera.", IDC_RESTARTTEXT, 25, 195, 209, 8 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

1 0

[reactos] 02/02: [REACTOS] Drop support for Visual Studio below 2015
by Victor Perevertkin 04 May '20

04 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=156b3bd0149a7caee67fa… commit 156b3bd0149a7caee67faebcfb09c77157ac55b3 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Apr 25 03:14:44 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 4 21:47:37 2020 +0300 [REACTOS] Drop support for Visual Studio below 2015 --- README.md | 2 +- configure.cmd | 5 +---- sdk/cmake/msvc.cmake | 12 +++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bf96c76dab8..a200f9a5dc1 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). -Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. 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). +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). ### Binaries diff --git a/configure.cmd b/configure.cmd index c0fa3ac00d4..2d780760681 100755 --- a/configure.cmd +++ b/configure.cmd @@ -50,14 +50,11 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 - cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 - cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( - echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. + echo Error: Visual Studio version too old ^(before 14 ^(2015^)^) or version detection failed. goto quit ) set BUILD_ENVIRONMENT=VS diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ce526ed979f..01bbfee00e0 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -50,19 +50,17 @@ endif() # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 -if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") +if(ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") endif () # VS 12+ requires /FS when used in parallel compilations -if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) +if(NOT MSVC_IDE) add_compile_flags("/FS") endif () # VS14+ tries to use thread-safe initialization -if(MSVC_VERSION GREATER 1899) - add_compile_flags("/Zc:threadSafeInit-") -endif () +add_compile_flags("/Zc:threadSafeInit-") # HACK: Disable use of __CxxFrameHandler4 on VS 16.3+ (x64 only) # See https://developercommunity.visualstudio.com/content/problem/746534/visual-c… @@ -112,8 +110,8 @@ add_compile_flags("/wd4018") add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced -# Not in Release mode and not with MSVC 2010 -if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT MSVC_VERSION LESS 1700)) +# Not in Release mode +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/we4189") endif()

1 0

[reactos] 01/02: [REACTOS] Raise C standard to gnu99 And remove -Wdeclaration-after-statement
by Victor Perevertkin 04 May '20

04 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95483b42ea1b45dc11620… commit 95483b42ea1b45dc11620ce139b8456ee9cdda76 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Apr 25 03:10:27 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 4 21:44:55 2020 +0300 [REACTOS] Raise C standard to gnu99 And remove -Wdeclaration-after-statement --- sdk/cmake/gcc.cmake | 7 +++---- sdk/include/reactos/libs/pseh/pseh3.h | 19 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 1a3be9a4ab4..616d4578f47 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -52,7 +52,7 @@ if(NOT GCC_VERSION VERSION_LESS 4.8) endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_flags_language("-std=gnu89 -Wno-microsoft" "C") + add_compile_flags_language("-std=gnu99 -Wno-microsoft" "C") set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") @@ -70,7 +70,6 @@ if(DBG) if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_flags_language("-Wold-style-declaration" "C") endif() - add_compile_flags_language("-Wdeclaration-after-statement" "C") endif() add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") @@ -351,8 +350,8 @@ endif() function(fixup_load_config _target) get_target_property(PEFIXUP native-pefixup IMPORTED_LOCATION_NOCONFIG) - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND "${PEFIXUP}" + add_custom_command(TARGET ${_target} POST_BUILD + COMMAND "${PEFIXUP}" "$<TARGET_FILE:${_target}>" COMMENT "Patching in LOAD_CONFIG") endfunction() diff --git a/sdk/include/reactos/libs/pseh/pseh3.h b/sdk/include/reactos/libs/pseh/pseh3.h index 6f9732ed728..05bb3de3b87 100644 --- a/sdk/include/reactos/libs/pseh/pseh3.h +++ b/sdk/include/reactos/libs/pseh/pseh3.h @@ -16,12 +16,6 @@ extern "C" { #endif -#ifdef __cplusplus -#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT -#else -#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") -#endif - /* CLANG must safe non-volatiles, because it uses a return-twice algorithm */ #if defined(__clang__) && !defined(_SEH3$_FRAME_ALL_NONVOLATILES) #define _SEH3$_FRAME_ALL_NONVOLATILES 1 @@ -358,9 +352,6 @@ _Pragma("GCC diagnostic pop") \ (void)&&_SEH3$_l_OnException; \ (void)&&_SEH3$_l_BeforeFilterOrFinally; \ (void)&&_SEH3$_l_FilterOrFinally; \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \ enum { \ @@ -373,8 +364,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Allocate a registration frame */ \ volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \ -\ -_Pragma("GCC diagnostic pop") \ \ goto _SEH3$_l_BeforeTry; \ /* Silence warning */ goto _SEH3$_l_AfterTry; \ @@ -390,9 +379,6 @@ _Pragma("GCC diagnostic pop") \ \ _SEH3$_l_BeforeTry: (void)0; \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the filter function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \ @@ -440,9 +426,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ _SEH3$_l_BeforeTry: (void)0; \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ -\ -_Pragma("GCC diagnostic push") \ -PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the finally function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \ @@ -479,8 +462,6 @@ PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Implementation of the auto cleanup function */ \ _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ -\ -_Pragma("GCC diagnostic pop") \ \ /* Close the outer scope */ \ }

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