Ports back:
partially 0.4.15-dev-8109-g d7be7486c9 [SHELL32] RC: Fix some FIXMEs (#6861), leaving out the comments
0.4.15-dev-8106-g a549a9d8e4 [SHELL32] ro-RO.rc Improvement (#6844)
0.4.15-dev-8021-g 7ce96fd364 [SHELL32] Fix keyboard navigation in file deletion dialog CORE-19564 (#6833)
partially 0.4.15-dev-7877-g e85ef799fe [SHELL32] Update Romanian (ro-RO) translation (PR6657)
0.4.15-dev-7842-g 558ab78fc5 [SHELL32] *.rc: Strip all unneeded WS_DISABLED in dlg style (#6675)
0.4.15-dev-7834-g 00c4b3d99f [SHELL32] *.rc: Anonymize the "LIST2" control in IDD_AUTOPLAY1 (#6672)
0.4.15-dev-7260-g 1061ed4d28 [SHELL32] *.rc 640x480-ify IDD_FOLDER_OPTIONS_* (#6165) CORE-1762
0.4.15-dev-3170-g e34a799f0c [BOOTDATA] Fix "DllName" casing.
0.4.14-dev-1487-g c0d5e4fd6b [SHELL32] CORE-16895 RC IDD_FOLDER_OPTIONS_FILETYPES All langs
0.4.14-dev-69-g 5d7ae44059 [SHELL32] Demote an ERR to WARN (which was a tiny part of PR1907) which actually started to spam with zipfldr-introducation already
partially 0.4.13-dev-623-g 019e3ffe5f [SHELL32] Recycle-Bin only rc-part LVS_SHOWSELALWAYS (part of PR1688, part of CORE12313)
0.4.13-dev-25-g 3b7f710fc7 [BOOTDATA] Remove stray value. ("MS Shell Dlg")
0.4.10-dev-253-g 1b1e1baa6e [SHELL32] Implement Folder Options File Types 'Change' button, part of (#629), part of CORE-12906
partially 0.4.9-dev-874-g 82a5983504 [SHELL32] Allow deleting a file type/extension (#553), part of CORE-12906 (without the confirmation dialog)
This backport focuses mainly on porting back the updates dimensions for folder-options-dlgs.
This allows a rudimentary form of 'Delete' and 'Change' button in folder-properties/filetypes for 0.4.9/0.4.8/0.4.7
(instead of throwing an exception when clicking the 'change'-button)
For now I did not port back the dlgs reachable by the 'New'-button and the 'Advanced'-button
into older branches, because those implementations are rather complex.
For now I did not port back the displaying of the icon / displaying of the associated application
into older branches, because their current implementation (in 0.4.10 and higher) does slow down the filetypes-dialog dramatically.
Delete FCIDM_SHVIEW_COPYTO & FCIDM_SHVIEW_MOVETO (fixes accelerator collisions in es-ES) and
IDS_ADVANCED_NET_CRAWLER & IDS_ADVANCED_WEB_VIEW_BARRICADE
because all of that is unimplemented in the older versions, and I do not intend to port any of that back ever.
Binary size of shell32.dll shrinks for all branches:
shell32.dll master RosBEWin2.2.2 GCC8.4.0 dbg x86 10.631.168 (0.4.15-dev-8027-g565a4b3)
shell32.dll releases/0.4.14 RosBEWin2.2.2 GCC8.4.0 dbg x86 9.201.664 -> 9.188.352
shell32.dll releases/0.4.14 RosBEWin2.1.6 GCC4.7.2 dbg x86 9.230.336 -> 9.216.512
shell32.dll releases/0.4.13 RosBEWin2.1.6 GCC4.7.2 dbg x86 9.086.976 -> 9.073.664
shell32.dll releases/0.4.12 RosBEWin2.1.6 GCC4.7.2 dbg x86 9.031.680 -> 9.018.368
shell32.dll releases/0.4.11 RosBEWin2.1.6 GCC4.7.2 dbg x86 8.954.880 -> 8.942.592
shell32.dll releases/0.4.10 RosBEWin2.1.6 GCC4.7.2 dbg x86 8.945.152 -> 8.932.352
shell32.dll releases/0.4. 9 RosBEWin2.1.6 GCC4.7.2 dbg x86 8.618.496 -> 8.607.744
shell32.dll releases/0.4. 8 RosBEWin2.1.6 GCC4.7.2 dbg x86 8.536.576 -> 8.528.896
shell32.dll releases/0.4. 7 RosBEWin2.1.6 GCC4.7.2 dbg x86 8.466.944 -> 8.459.776
ports back the following commits:
0.4.15-dev-3822-g 78a7d7dc32 [CMIDRIVER] Remove useless Visual Studio resource editor aps-file
0.4.12-dev-399-g 32faa24733 [BUTTERFLIES] Fix GCC build, addendum to 0.4.12-dev-397-g 2890a22179
a tiny fraction of 0.4.12-dev-397-g 2890a22179 just the [BUTTERFLIES] Avoid DLGPROC cast
0.4.8-dev-58-g bcbe0dd8cd [CPL] Remove unnecessary DLGPROC casts. (#99)
0.4.8-dev-30-g 830fc82afe [SERIALUI] Set the stdcall calling convention for CommDlgProc() and make it return INT_PTR
Ftr, there are still a few DLGPROC casts left after this commit in ros source tree,
but I don't want to port back the commits yet, which addressed them.
Too fresh still, no need to rush that.
this ports back (also) the following commit:
0.4.15-dev-6308-g 2d9877470d
While touching those files, port back some minor translation improvements also.
but actually I did concentrate here on porting back the following commits:
0.4.8-dev-547-g e9d8fa57c3 [TRANSLATION][BASE][FDEBUG][MODULES][WIN32SS] Use correct font name in Chinese resources, CORE-9566 (#227)
0.4.8-dev-546-g d09998dfc7 [TRANSLATION][APPLICATIONS] Use correct font name in Chinese resources, CORE-9566 (#226)
0.4.8-dev-539-g bf51ed17f8 [SHELLEXT] Use correct font name in Chinese resources, CORE-9566 (#224)
0.4.8-dev-538-g 1ebe4a5b83 [TRANSLATION] Use correct font name in Chinese resources, Part 3/3, CORE-9566 (#223)
0.4.8-dev-537-g 074f5c6c13 [TRANSLATION] Use correct font name in Chinese resources, Part 2/3, CORE-9566 (#222)
0.4.8-dev-536-g 81d6232aa3 [TRANSLATION] Use correct font name in Chinese resources, Part 1/3, CORE-9566 (#221)
partially 0.4.8-dev-534-g b214b160b6 setup: Use correct font name in resource: CORE-9566 (#219) (I left out all the changes to [WELCOME])
0.4.8-dev-533-g 2b91b29642 [CPL] Control Panel Applets: Use correct font name in Chinese resources, CORE-9566 (#220)
------
tr-TR.rc: Also strip outdated email address erdemersoy@live.com instead of following 0.4.8-dev'ing
with replacing it with an even longer address, that later got changed another time.
The auto-replacement during 0.4.8-dev'ing did lead to some very long lines in many header sections. Don't want that.
Restores *inferior* code for older branches.
I recently ported back the *proper* 0.4.15-dev-4352-g cfe387a9b0
as part of:
0.4.10-release-186-g e5d8019d24
0.4.9-release-197-g 557db9a1ac
0.4.8-release-203-g 78daf4169a
0.4.7-release-229-g e0a3b0c8f5
That backport worked very well in releases/0.4.11 to releases/0.4.14
and it also caused no severe issues for releases/0.4.7 to releases/0.4.10
e.g. the mouse and keyboard works well, tested with VBox4.3.12 & MS VirtualPC 2007 SP1 6.0.192.0
but I noticed some logspam that happens for releases/0.4.7 to releases/0.4.10 and only during 2nd stage:
bad-path (with the commas):
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\kbdclass.sys' with status 0xc000003a
(../ntoskrnl/io/iomgr/driver.c:696) Failed to load class upper filters: C000003A
(../ntoskrnl/io/iomgr/device.c:434) No DriverUnload function on PnP driver! '\Driver\I8042PRT' will not be unloaded!
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\mouclass.sys' with status 0xc000003a
(../ntoskrnl/io/iomgr/driver.c:696) Failed to load class upper filters: C000003A
(../ntoskrnl/io/iomgr/device.c:434) No DriverUnload function on PnP driver! '\Driver\I8042PRT' will not be unloaded!
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\vbemp.sys' with status 0xc000003a
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\kbdclass.sys' with status 0xc000003a
(../ntoskrnl/io/iomgr/driver.c:696) Failed to load class upper filters: C000003A
(../ntoskrnl/io/iomgr/device.c:434) No DriverUnload function on PnP driver! '\Driver\I8042PRT' will not be unloaded!
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\mouclass.sys' with status 0xc000003a
(../ntoskrnl/io/iomgr/driver.c:696) Failed to load class upper filters: C000003A
(../ntoskrnl/io/iomgr/device.c:434) No DriverUnload function on PnP driver! '\Driver\I8042PRT' will not be unloaded!
...
(../base/services/umpnpmgr/umpnpmgr.c:3653) Removal pending: ACPI\PNP0303\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3623) Safe removal: ACPI\PNP0303\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3653) Removal pending: ACPI\PNP0F03\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3623) Safe removal: ACPI\PNP0F03\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3653) Removal pending: ACPI\PNP0303\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3623) Safe removal: ACPI\PNP0303\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3653) Removal pending: ACPI\PNP0F03\2&ccb86d17&0000
(../base/services/umpnpmgr/umpnpmgr.c:3623) Safe removal: ACPI\PNP0F03\2&ccb86d17&0000
good-path (without the commas):
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\System32\DRIVERS\i8042prt.sys' with status 0xc000003a
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\System32\DRIVERS\i8042prt.sys' with status 0xc000003a
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\system32\drivers\vbemp.sys' with status 0xc000003a
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\System32\DRIVERS\i8042prt.sys' with status 0xc000003a
(../ntoskrnl/mm/ARM3/sysldr.c:3025) ZwOpenFile failed for '\SystemRoot\System32\DRIVERS\i8042prt.sys' with status 0xc000003a
...
(../../ntoskrnl/mm/ARM3/sysldr.c:176) Loading: \SystemRoot\System32\DRIVERS\i8042prt.sys at F771B000 with 1b pages
...
and no such 'Removal pending'
So we do still miss some unknown commit from 0.4.11-dev'ing that will avoid that additional logspam with the corrected hivesys.inf.
I have not identified that commit yet, and until I will, I do play safe by restoring the wrong List-multi-string in hivesys.inf.
port back:
0.4.10-dev-615-g 45fd48bd0f [CDFS_NEW] -> [CDFS] No old driver, thus no new driver
0.4.10-dev-614-g 5795254933 [CDFS] Delete the old CDFS driver.
The new MS PL licensed one worked for several years fine for us now
even in the older releases.
So no need to keep our old unfinished one any longer within
the release-branches. They are no mausoleum.
This does *not* change, which driver is actually in use.
We do continue to use 1:1 the state of current releases/0.4.10
0.4.15-dev-5102-g 18d40ebe81 [BOOTDATA] hivesys.inf: Remove redundant fastfat "Start" entry. The one in the [AddReg] section has the very same value.
-------
0.4.15-dev-5012-g e3f8f52f3d [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout
Katayama explained: These registry values are for pre-installed IMEs we don't have. It is safe to remove them also in the older branches.
-------
0.4.15-dev-4352-g cfe387a9b0 [BOOTDATA] Add two missing separating commas in the ServiceGroupOrder List multi-string.
-------
PARTIALLY PICK: 0.4.15-dev-4412-g 94d144f8a5 [BOOTDATA] Fix some services groups
- AudioSrv belongs to "AudioGroup" (and not "Audio" that doesn't exist).
- lanmanworkstation belongs to "NetworkProvider" (without a space).
I dared only to pick the "NetworkProvider" and "AudioGroup" part for now. The MUP part I might do later when actually being able to retest CORE12107 "VMWare tools" myself.
-------
0.4.15-dev-1097-g 0689455bb3 [BOOTDATA] Comment out biosinfo.inf (#3266)
This allows ros to boot with its LiveCD files using MS NTLDR!
I stripped the line here, instead of commenting it as the master commit did. The file does not exist.
-------
0.4.9-dev-643-g 40d7381e28 [BOOTDATA] Remove 'debugout.sys' mention. since this driver has been removed in SVN r26032 == git ad07a1e58f
-------
Additionally to those backports I cleaned up some of the stuff that was previously commented out and/or broken:
- strip some 'translated' service strings that were just copy-pasted from the english strings section
without actually getting translated at all. The english ones will be used anyway.
It is enough to have that redundant stuff in master to allow translators to see it.
- Also strip the disabled BENGALI_INSCRIPT kbdinben.dll. Where the existing lines even had bugs in the older branches as proven by 0.4.15-dev-3322-g c6e002bfb3
It was always disabled and was neither localizable, nor did it have the correct layout code even. No such file even.
None of those changes will introduce any additional diff or break any existing features.
They just slightly move the already existing diffs position in time towards newer release-branches.
Switches from "FreeMono" and "Dejavu Sans Mono" to "Courier New" and "Lucida Console"
and therefore brings us closer to 2k3sp2 stock fonts. Saves some RAM also.
Deletes some "Ubuntu" font left-overs in some Themes.
CORE-18605 (and partially CORE-16264)
By porting back the following commits:
0.4.15-dev-5362-g c47758b102 [SETUP][INF][MEDIA] Get rid of the last Ubuntu references CORE-18607 (#4871)
0.4.15-dev-5336-g bd40c13f6f [SETUP][BOOTDATA][FONTS][INF] Delete DejaVu Sans Mono and re-map (#4856)
0.4.15-dev-5335-g a4193ade03 [SETUP][FONTS][INF][GDI32_APITEST] Delete FreeMono and re-map (#4852)
0.4.15-dev-5324-g d035452148 [SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans" (#4829)
0.4.13-dev-768-g dc1aa8010a [FONTS][SETUP][BOOTDATA] Add Lucida Console font (#1793) CORE-16264
0.4.13-dev-750-g faa3237d46 [FONTS][BOOTDATA][SETUP] Add Courier New fonts (#1783)
*partial* pick of 0.4.9-dev-719-g b3fb8555bf
I picked only the STATIC controls registration and implementation to
fix CORE-11195 'A drawing glitch in hundreds of NSIS installers'
----------
Above commit requires me also to port back the following 2 commits
0.4.15-dev-534-g 887764e607 (fix) Mouse Pointer CORE-17062 (#2829)
0.4.15-dev-2705-g a3cadf630a (nitpick)
to prevent a regression with the mouse pointers preview in the mouse applet CORE-17062.
----------
0.4.9-dev-32-g b02d78586c CORE-14346 'Auslogics Disk Defrag Free v8.0.4.0 installer fails to start'
----------
partially pick 0.4.8-dev-505-g 435b0b19d2 Install comctl32 v6 and its manifest in first stage
As this fixes a lot of log spam during 2nd stage of the kind:
(../sdk/lib/rtl/actctx.c:3072) Could not find dependent assembly Microsoft.Windows.Common-Controls (6.0.0.0)
err:(../dll/win32/comctl32/commctrl.c:206) CreateActCtxW failed! bV6=0
...
I took that part which copies the manifests during 1st stage already. That allows to strip some former rosdiffs from comctl32
that we introduced for showing the theme selection dialog. And harmonizes the manifests filenames to the newer branches.
I left out the part which triplicates comctl32.dll 1x system32 and 2x within WinSXS.
See https://reactos.org/wiki/ReactOS_Foundation for more information.
the first part of CORE-18191
picked from 0.4.15-dev-4866-g 6881d8c624
Respect:
-Colins wish to leave out for now all the matches in kbdtool for legal uncertainty
-boot_images.cmake on master vs. boot/CMakeLists.txt in older branches
-treating cpu.inf special in this first commit for the sake of keeping sync to all other infs
-unlike master I decided to groom also cdmake, because I don't see any reason yet to dump that
in the older branches
-all releases down to releases/0.4.7 were released for the first time after the "ReactOS foundation"
dissolved already in 2015. So all are definitely fine to receive this commit.
-port back some EOL whitespace fixes as well in common.ver to sync the file to 100% to master head
The main motivation to port all that back is to get rid of Win32K-BSODs 0x50 like CORE-13907
that could be triggered by user-mode-applications.
Technical reason was CORE-14857 "RtlImageNtHeaderEx needs SEH" and issues with hooks+callbacks.
All other tickets mentioned in here were regressions that we experienced on the long
journey towards perfecting the fixes on master head, and those were not happening yet in the older builds,
so they are mentioned in here only to allow tracking where that code went into.
Thanks to Jim Tabor, Mark Jansen & Thomas Faber
By squashed backmerge of the following commits:
0.4.15-dev-3440-g a89844f740
0.4.15-dev-3430-g 9cff384c22
0.4.14-dev-1287-g 568b6d0558
0.4.14-dev-1255-g 177ae91bf6
0.4.14-dev-1241-g 915a5764a9
0.4.14-dev-1240-g d8add40e89
0.4.14-dev-1002-g feb7df42b4
JIRA-tickets: CORE-13907, CORE-16769, CORE-14857, CORE-17856, CORE-17857, partially CORE-13019.
We also had some more dupes of CORE-13907 in JIRA, but I linked all of them (transitively)
towards the initial report, and resolved them without setting a fixVer for them.
In more detail:
--------------
[USER32] Fix BSOD 0x50 in 'WineVDM + Castle Of Winds' CORE-17856 CORE-17857
CORE-17856 BSOD 0x50 when starting Castle of the Winds second time, with WineVDM
CORE-17857 BSOD 0x50 on shutdown after closing Castle of the Winds with WineVDM
0.4.15-dev-3430-g 9cff384c22
0.4.15-dev-3440-g a89844f740
--------------
[NTUSER] Fix Strings and Format to Hooks
Allocate heap instead of data segment to be used for callbacks on user side.
Move and correct initial hook call out setup. Use it in more than one hook call.
This fixes issues with strings out of alignment and use of kernel pointers.
See CORE-13907 (HXD-portable BSOD) and CORE-16769 (HXD-portable exception)
Small wow update.
cherry picked from commit 0.4.14-dev-1287-g 568b6d0558
--------------
[RTL] Introduce RtlpImageNtHeader,
which implements the required functionality.
ntdll and ntoskrnl now have a wrapper for this, with SEH.
This protects the function against malformed / bad images,
whilst still being able to use the code in freeldr et al.
Idea from Thomas.
CORE-14857
cherry picked from commit 0.4.14-dev-1255-g 177ae91bf6
--------------
[WIN32SS] Form Sanity to Hook Callbacks
Fix WH_CALLWNDPROC/RET data to user hook calls.
Helps with CORE-13907 "(HXD-portable BSOD)"
Fixes the logging of "(win32ss/user/ntuser/callback.c:748) err: Failure to make Callback! Status 0xc00000fd" within CORE-13019, but not the whole ticket.
cherry picked from commit 0.4.14-dev-1241-g 915a5764a9
--------------
[USER32] Fix null return.
See CORE-16769 "HxD 1.7.7.0 portable unhandled exception"
cherry picked from commit 0.4.14-dev-1240-g d8add40e89
--------------
[WIN32SS] Fix a typo in dbg print
cherry picked from commit 0.4.14-dev-1002-g feb7df42b4
My main motivation to update them on 0.4.7 is not because the old ones
were to old yet, but because the newer ones are shorter in size.
This is the only way for me to complete the 1st stage setup with DPH
with 1500MB RAM. I cannot afford to spend more than that on my host.
The amount of memory needed for importing the caroots.inf with DPH is insane!
Ftr: The caroots.inf that I decided to import here, are to date 2022-03-03
used within releases/0.4.8 to releases/0.4.13.
The caroots.inf on current master head is a bit smaller even, but I dislike
the idea to use 100% the same one in all ros branches at a specific point
in time. So porting that one back will have to wait a bit still.
... in order to let RawFS these volumes.
This avoids bloated setup and avoids potential bugs in 3rd party drivers.
For now, this commit doesn't change anything, but once IopParseDevice hack
gets removed, this will make a difference!
These commits were part of CORE-6305 but that is not the reason why I picked them,
but because moving those drivers into the cabs reduces the iso file-size a bit
and they reduce a bit of log-spam in bootcds 1st stage setup.
by picking the 2 commits:
0.4.8-dev-442-g 5a650f6ba5
0.4.8-dev-438-g 806cd16328
Although the new layout that I committed in the previous commit
was favored by community ratings votes 8:0,
some devs still preferred the old layout with the bigger logo
because they liked the easteregg. So this commit restores
that.
But it syncs to that features latest&greatest implementation
we have in 0.4.15-dev-1685-gd0c237a instead of reverting the
previous commit to not unnecessarily have many bugs with it
that were still affecting the older releases beforehand.
Aside from the general tabs dialogs layout this commit does
also fix some minor issues in the translations for the oldest
branches in pl-PL, jp-JA, zh-CN and zh-TW.
And it fixes an x64 issue in general.c for 0.4.7 and 0.4.8.
The version string cutoff started to happen when we switched from SVN
with its short revision number to git with the longer hashes.
0.4.7-dev-502-gc2c66af was the first git-only rev (2017-Oct-03)
and brings the dialogs layout closer to XP.
Also fixes some other truncations for specific languages.
And unifies the touched text controls sizes for all languages.
The credits have been moved to readme.txt where they are more present and
we can avoid having to groom all languages files each time we want to add
a new dev (and sysdm.cpl to grow each time). Less maintenance.
sysdm.cpl binary size I18N=all
master before 925.696bytes after 705.024bytes gcc 8.4.0 dbg RosBE2.2.1
0.4.14 before 923.136bytes after 702.464bytes gcc 8.4.0 dbg RosBE2.2.1
0.4.13 before 904.192bytes after 684.544bytes gcc 4.7.2 dbg RosBE2.1.6
0.4.12 before 881.664bytes after 665.600bytes gcc 4.7.2 dbg RosBE2.1.6
0.4.11 before 836.096bytes after 618.496bytes gcc 4.7.2 dbg RosBE2.1.6
0.4.10 before 806.912bytes after 588.800bytes gcc 4.7.2 dbg RosBE2.1.6
0.4. 9 before 788.480bytes after 585.728bytes gcc 4.7.2 dbg RosBE2.1.6
0.4. 8 before 788.480bytes after 585.728bytes gcc 4.7.2 dbg RosBE2.1.6
0.4. 7 before 788.992bytes after 585.728bytes gcc 4.7.2 dbg RosBE2.1.6
readme.txt still fits into a single NTFS cluster afterwards with 3702bytes
Also a very! soft update of some translations ported back.
which effectively mutes them.
Silence harmless errors, which can be reported at every boot.
And do get logged even before the "-------------" reboot-delimiter.
inspired by 0.4.8-dev-875-g b5a7765068
I decided to just switch to WARN for the backport,
but to not enlarge the strings contents/lengths.
