Joann Mõndresku [Wed, 20 Mar 2019 20:34:33 +0000 (22:34 +0200)]
[THEMES] Add artwork for Lunar.
Added original artwork for the new Lunar theme.
Adam Słaboń [Wed, 20 Mar 2019 20:23:29 +0000 (21:23 +0100)]
[THEMES] Add new ReactOS theme - Lunar. By Adam Słaboń and Joann Mõndresku.
Reuse some Lautus assets, adjust the theme configuration and include it in the build process.
jimtabor [Sun, 31 Mar 2019 18:31:59 +0000 (13:31 -0500)]
[NtGdi] Fix assert with Winamp
Fixes CORE-10774.
Reference:
Alexandre Julliard : Ignore empty rectangles in ExtCreateRegion.
https://source.winehq.org/git/wine.git/commitdiff/
8ac61c5a1e56d0933de8af69dbb2a1640d13e05d
Bișoc George [Sat, 30 Mar 2019 13:48:44 +0000 (14:48 +0100)]
[COVERITY][SPOOLSS] Fix a resource leak
Unload the library pointed by hWinspool when the function fails.
CID
1401149
Baruch Rutman [Thu, 28 Mar 2019 21:06:46 +0000 (23:06 +0200)]
[RAPPS] Add themes category
Add category string to the rest of rc files
Update README
Raul Tambre [Sun, 24 Feb 2019 10:59:14 +0000 (12:59 +0200)]
[CONFIGURE] Add VS 16.0 support.
Raul Tambre [Sun, 24 Feb 2019 10:58:22 +0000 (12:58 +0200)]
[CONFIGURE] Simplify Visual Studio generator selection.
CMake >3.2 supports specifying the architecture through the -A parameter,
allowing the logic to be simplified.
Specifying the architecture like this is also required since Visual Studio 2019.
Bartosz Brachaczek [Sun, 31 Mar 2019 17:33:53 +0000 (19:33 +0200)]
[NTOSKRNL] Addendum to
21d2c70: properly start DOS_START loop
Fixes last failing test.
CORE-15902
Maxim Smirnov [Sun, 31 Mar 2019 11:51:06 +0000 (14:51 +0300)]
[NTOSKRNL] In MmCreateImageSection, properly check whether cache was initialized
This fixes a crash that occurs if nul is typed in cmd.exe
Bartosz Brachaczek [Sun, 31 Mar 2019 09:42:56 +0000 (11:42 +0200)]
[NTOSKRNL] Properly copy backtracking buffer content on realloc
CORE-15902
Bartosz Brachaczek [Sun, 31 Mar 2019 09:32:57 +0000 (11:32 +0200)]
[NTOSKRNL] Properly compare position to name length in FsRtlIsNameInExpressionPrivate
CORE-15902
Bartosz Brachaczek [Sun, 31 Mar 2019 09:27:16 +0000 (11:27 +0200)]
[NTOSKRNL] Don't overflow backtrack stack buffer
CORE-15902
Bartosz Brachaczek [Sun, 31 Mar 2019 09:15:38 +0000 (11:15 +0200)]
[NTOSKRNL] Don't oversize buffer for backtracking in FsRtlIsNameInExpressionPrivate
CORE-15902
Pierre Schweitzer [Sun, 31 Mar 2019 09:09:43 +0000 (11:09 +0200)]
[KMTESTS:FSRTL] Add more tests for FsRtlIsNameInExpression
CORE-15902
Thomas Faber [Wed, 27 Mar 2019 14:40:37 +0000 (15:40 +0100)]
[MBEDTLS] Update to version 2.7.10. CORE-15895
Thomas Faber [Sat, 30 Mar 2019 10:18:50 +0000 (11:18 +0100)]
[ACPICA] Update to version
20190329. CORE-15900
Thomas Faber [Fri, 29 Mar 2019 08:08:36 +0000 (09:08 +0100)]
[NTOS:IO] Send IRPs to the correct device in IoVolumeDeviceToDosName. CORE-15415
Pierre Schweitzer [Fri, 29 Mar 2019 20:51:41 +0000 (21:51 +0100)]
[MEH] Forgot that file :-(
Pierre Schweitzer [Fri, 29 Mar 2019 20:47:34 +0000 (21:47 +0100)]
[NTOSKRNL] We don't need an event if we don't issue an IRP
Pierre Schweitzer [Fri, 29 Mar 2019 20:42:42 +0000 (21:42 +0100)]
[NTOSKRNL] Implement support for FileFsDriverPathInformation in NtQueryVolumeInformationFile
Pierre Schweitzer [Fri, 29 Mar 2019 18:51:38 +0000 (19:51 +0100)]
[NTOSKRNL] Do. Not. L. E. A. K.
Maxim Smirnov [Wed, 27 Mar 2019 01:23:21 +0000 (04:23 +0300)]
[NULL] Use correct device characteristics value for the null device
Pierre Schweitzer [Thu, 28 Mar 2019 21:39:15 +0000 (22:39 +0100)]
[NTOSKRNL] Only allow direct device open for FileFsDeviceInformation
Pierre Schweitzer [Thu, 28 Mar 2019 21:29:22 +0000 (22:29 +0100)]
[NTOSKRNL] Add a quick path for FileFsDeviceInformation in NtQueryVolumeInformationFile
This allows querying volume information without issuing an IRP to the owner device.
The kernel is supposed to already have all the required information to return
to the caller.
Side effect: this allows querying volume information for devices not implementing
IRP_MJ_QUERY_VOLUME_INFORMATION such as null.sys
This fixes opening null device in Python.
Fix based on debugging by Maxim Smirnov in PR #1442
CORE-14551
Bișoc George [Thu, 28 Mar 2019 15:09:16 +0000 (16:09 +0100)]
[OSK] Initialize the common controls
On-Screen Keyboard has a manifest which is used for visual styles. However, the common controls aren't initialized and as a general rule the controls have to be loaded in the application's handle instance.
jimtabor [Wed, 27 Mar 2019 22:39:04 +0000 (17:39 -0500)]
[NtUser] Fix maximizing to window edge
Cover up the edge of the frame while maximizing the window to desktop.
Fixes CORE-15893.
Bișoc George [Sun, 24 Mar 2019 08:40:43 +0000 (09:40 +0100)]
[OSK] Fix an instance race condition
On-Screen Keyboard provides a mechanism to launch the application only once, to avoid multiple entry point instances. Such mechanism is based upon mutex objects, although it could happen that the program may end up creating two or more mutexes (a race condition).
CORE-15877
jimtabor [Tue, 26 Mar 2019 20:56:57 +0000 (15:56 -0500)]
[Win32SS] Fix maximized window positioning.
Fix CORE-5177 TaskMgr and ProcExp possionong when maximized.
Thomas Faber [Tue, 12 Mar 2019 09:19:35 +0000 (10:19 +0100)]
[LIBXML2] Update to version 2.9.9. CORE-15854
Thomas Faber [Mon, 11 Mar 2019 19:33:40 +0000 (20:33 +0100)]
[LIBTIFF] Update to version 4.0.10. CORE-15854
Yaroslav Kibysh [Mon, 25 Mar 2019 22:15:00 +0000 (00:15 +0200)]
[DEVMGR] Fix Ukrainian translation (#1441)
Thomas Faber [Mon, 25 Mar 2019 21:40:32 +0000 (22:40 +0100)]
[NTOS:FSTUB] Unfix format string warning until GUID definition is fixed.
Thomas Faber [Sun, 24 Mar 2019 09:55:04 +0000 (10:55 +0100)]
[NTOS:IO] Avoid an unnecessary stack buffer in OpenRegistryHandlesFromSymbolicLink. CORE-15882
Thomas Faber [Sun, 24 Mar 2019 14:44:44 +0000 (15:44 +0100)]
[NTOS:FSTUB] Fix a clang format string warning.
Thomas Faber [Sun, 24 Mar 2019 15:10:33 +0000 (16:10 +0100)]
[NTOS:IO] Fix always-false condition in IoCheckEaBufferValidity.
Spotted by clang.
Thomas Faber [Sun, 24 Mar 2019 09:43:53 +0000 (10:43 +0100)]
[NTOS:KDBG] Fix uninitialized variable usage.
Spotted by clang.
Eric Kohl [Sun, 24 Mar 2019 23:19:58 +0000 (00:19 +0100)]
[SYSDM] Add the 'Copy to' dialog and move the 'Change Profile Type' dialog a little.
Brock Mammen [Sat, 23 Mar 2019 16:16:44 +0000 (11:16 -0500)]
Fix regression with double click action
The double click action is now triggered by the WM_LBUTTONDBLCLK message
instead of WM_NCLBUTTONDBLCLK.
Brock Mammen [Sat, 23 Mar 2019 16:16:44 +0000 (11:16 -0500)]
[EXPLORER] Add date tooltip to taskbar clock
CORE-11444
Stanislav Motylkov [Mon, 18 Mar 2019 17:12:41 +0000 (20:12 +0300)]
[USER32] Edit: Fix caret and scroll position
Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780
Stanislav Motylkov [Mon, 18 Mar 2019 17:10:10 +0000 (20:10 +0300)]
[COMCTL32] Edit: Fix caret and scroll position
Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780
Hermès Bélusca-Maïto [Sun, 24 Mar 2019 16:18:06 +0000 (17:18 +0100)]
[USER32] Add support for navigating a group of radio buttons using a keyboard.
Import Wine commit:
https://source.winehq.org/git/wine.git/commit/
b1b8fb77be5dd9a8754b04b2ef9f703bbe393d59
"user32: Add support for navigating a group of radio buttons using a keyboard.
The patch approximates the behaviour observed in the message tests
but still doesn't make the message tests pass without failures.
"
by Dmitry Timoshkov.
See bug report https://bugs.winehq.org/show_bug.cgi?id=16845
Hermès Bélusca-Maïto [Sun, 24 Mar 2019 16:01:07 +0000 (17:01 +0100)]
[USER32][COMCTL32] Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler.
CORE-8526
Import Wine commit:
https://source.winehq.org/git/wine.git/commit/
96d0af52eb0d14084397647b974c5efebb59d0f0
"user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler.
This patch also changes the logic to get the control style with WM_GETDLGCODE
instead of GetWindowLong to make the message test pass.
"
by Dmitry Timoshkov.
See bug report https://bugs.winehq.org/show_bug.cgi?id=42010
- (ReactOS-only) Fix also the corresponding logic in COMCTL32.
Yaroslav Kibysh [Sun, 24 Mar 2019 13:56:43 +0000 (15:56 +0200)]
[EXPLORER][SHPOLICY] Implement "NoSimpleStartMenu" policy (#1258)
- Enable "New Start Menu" control for all languages.
- Implement the "NoSimpleStartMenu" policy in shpolicy.c and its usage in explorer.
- Hide controls instead of disabling (as in Win XP/Vista).
Thomas Faber [Tue, 19 Mar 2019 20:47:11 +0000 (21:47 +0100)]
[UNIATA] Update to version 0.47. CORE-15870
Eric Kohl [Sun, 24 Mar 2019 12:02:10 +0000 (13:02 +0100)]
[IDL] Fix the declaration of function 7 (NetrBrowserStatisticsClear)
Thomas Faber [Mon, 14 Jan 2019 08:10:22 +0000 (09:10 +0100)]
[SERIAL] Do not return NTSTATUS from an interrupt routine.
Eric Kohl [Sun, 24 Mar 2019 05:49:27 +0000 (06:49 +0100)]
[SYSDM] Get a profiles 'State' value and use it to display the profile type.
Baruch Rutman [Fri, 15 Feb 2019 01:57:35 +0000 (03:57 +0200)]
[GDI32] Integrate LpkGetTextExtentExPoint(). (#1362)
- Assume that GetTextExtentExPointWPri() uses the same kind of
arguments as GetTextExtentExPointW().
- Add GetTextExtentExPointWPri() declaration to undocgdi.h.
Baruch Rutman [Fri, 15 Feb 2019 01:54:10 +0000 (03:54 +0200)]
[LPK] Implement LpkGetTextExtentExPoint(). (#1362)
- Add argument checking.
- Use logic from NtGdiGetTextExtentExW().
Yaroslav Kibysh [Sat, 23 Mar 2019 21:18:42 +0000 (23:18 +0200)]
[SYSDM] Update Russian and Ukrainian translations (#1437)
Eric Kohl [Sat, 23 Mar 2019 19:57:02 +0000 (20:57 +0100)]
[SYSDM] Simplify AddUserProfile() by using fixed size buffers for account and domain names and handle unknown and deleted accounts properly. Also fix fonts for asian languages.
Stanislav Motylkov [Sat, 23 Mar 2019 17:53:01 +0000 (20:53 +0300)]
[SHELL32] Add line bar to About dialog for consistence
Addendum to
f9d2931. CORE-15215
Eric Kohl [Sat, 23 Mar 2019 17:24:07 +0000 (18:24 +0100)]
[SYSDM] Add the 'Change Profile Type' dialog.
Yaroslav Kibysh [Sat, 23 Mar 2019 17:28:39 +0000 (19:28 +0200)]
[SHPOLICY] Fix the missing backslash in SHRestricted. CORE-15666 (#1267)
Import Wine commit https://source.winehq.org/git/wine.git/?a=commit;h=
dbbfa481539acd29de47ff6cd5cc2d24a2e01871
Original patch from Yaroslav Kibysh, reported to Wine and committed there by Fabian Maurer.
Thank you all!
Carlo-Bramini [Tue, 19 Mar 2019 20:23:32 +0000 (21:23 +0100)]
[WINVER] Fix WINVER theming. CORE-13343 (#1428)
Use and initialize common controls for theming support,
and include a manifest as well.
Bișoc George [Sat, 2 Mar 2019 17:10:26 +0000 (18:10 +0100)]
[OSK] Restore the previous window coordination
Implement the coordination dialog data saver. This allows OSK to launch using the previous placement values. Such behaviour can be seen with the XP's part of On-Screen Keyboard.
Hermès Bélusca-Maïto [Sat, 23 Mar 2019 15:31:15 +0000 (16:31 +0100)]
[WTSAPI32][PSDK] Addendum to
27ed609a: Some of the WTS_INFO_CLASS values are NT6-SP1+
Andrew Boyarshin [Wed, 28 Nov 2018 14:17:34 +0000 (21:17 +0700)]
[WTSAPI32] Implement WTSConnectState and WTSClientProtocolType in WTSQuerySessionInformation
Since ReactOS doesn't actually support non-local WinSTA/WTS capabilities, this seems to be a good way to reduce spam in the log while providing correct behaviour.
Also call Unicode version from ANSI one to reduce code duplication.
Stanislav Motylkov [Tue, 19 Mar 2019 23:42:09 +0000 (02:42 +0300)]
[USER32] Edit: Fix rectangle overflow when inserting characters
Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-11475
Stanislav Motylkov [Tue, 19 Mar 2019 23:39:47 +0000 (02:39 +0300)]
[COMCTL32] Edit: Fix rectangle overflow when inserting characters
Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-11475
Yaroslav Kibysh [Sat, 23 Mar 2019 14:20:34 +0000 (16:20 +0200)]
[ACPPAGE][SYSDM] Update Ukrainian translation (#1435)
Daniele Campione [Sat, 23 Mar 2019 00:07:37 +0000 (01:07 +0100)]
[SNDVOL32] Small Italian translation update (#1431)
Eric Kohl [Thu, 21 Mar 2019 20:56:37 +0000 (21:56 +0100)]
[SYSDM] Implement the 'delete profile' button, except for deleting the profile.
Eric Kohl [Thu, 21 Mar 2019 20:51:56 +0000 (21:51 +0100)]
[SYSDM] Update the buttons on the user profile dialog after adding the profiles to the listview.
Stanislav Motylkov [Wed, 20 Mar 2019 16:04:20 +0000 (19:04 +0300)]
[SYSDM] Update Russian translation
Addendum to
71f84a3.
Stanislav Motylkov [Wed, 20 Mar 2019 15:46:29 +0000 (18:46 +0300)]
[ACPPAGE] Update Russian translation
Addendum to
ab3451a.
Eric Kohl [Tue, 19 Mar 2019 22:17:12 +0000 (23:17 +0100)]
[SYSDM] Add some strings that will be used in the user profile dialog.
Stanislav Motylkov [Sun, 17 Mar 2019 22:14:46 +0000 (01:14 +0300)]
[MSI] Allow to pass product key validation check
CORE-14710 CORE-15864
Luo Yufan [Mon, 18 Mar 2019 13:42:36 +0000 (21:42 +0800)]
[SAMSRV] Update Chinese translation
Thomas Faber [Sat, 2 Feb 2019 14:52:13 +0000 (15:52 +0100)]
[RICHED20] Simplify MSVC thiscall & stdcall wrappers.
Imports Wine commit
b64511c00a5.
jimtabor [Mon, 18 Mar 2019 22:30:01 +0000 (17:30 -0500)]
Merge branch 'master' of https://github.com/reactos/reactos
jimtabor [Mon, 18 Mar 2019 22:28:33 +0000 (17:28 -0500)]
[NtUser] Support SWP_FRAMECHANGED
Implement SWP_FRAMECHANGED support for non-changing window to force a
redraw.
Patch dedicated to Katayama Hirofumi MZ.
Eric Kohl [Mon, 18 Mar 2019 22:24:06 +0000 (23:24 +0100)]
[USERENV] UnloadUserProfile: When a profiles ref count gets 0, delete the profile if the user is a member of the guests group.
Mark Jansen [Sun, 17 Mar 2019 12:31:31 +0000 (13:31 +0100)]
[ACPPAGE] Revamp the 'edit' page to easier select different layers
Carlo-Bramini [Sun, 4 Nov 2018 10:38:31 +0000 (11:38 +0100)]
[CALC] Update to version 1.12 -- Update whatsnew.txt
Carlo-Bramini [Sun, 4 Nov 2018 10:08:44 +0000 (11:08 +0100)]
[CALC] Added "Minute of arc" and "Second of arc" to the "Angles" units. CORE-5939
Carlo-Bramini [Fri, 24 Aug 2018 18:08:54 +0000 (20:08 +0200)]
[CALC] Add new, and fix existing units conversions. CORE-5939
- Add support for new conversion units:
* AREA: 'mu', 'rai'.
* LENGTH: 'chi', 'cun'. 'sun' optimized.
* TIME: 'nanoseconds'.
* WEIGHT: 'Kan', 'Kin'.
- Add support for thailand measure system; invaluable help from
this page: http://www.eppo.go.th/ref/UNIT-ALL.html
- Add ZHANG (Chinese), and DANBO, JEONGBO (Korean) units.
See details here:
https://en.wikipedia.org/wiki/Chinese_units_of_measurement
https://en.wikipedia.org/wiki/Korean_units_of_measurement
- Rewritten some units formula by using scientific notation.
- Improved precision of parsec unit coversion formula.
Carlo-Bramini [Sun, 12 Aug 2018 09:35:17 +0000 (11:35 +0200)]
[CALC] Fix wrong button size in french. CORE-12359
Carlo-Bramini [Tue, 7 Aug 2018 18:47:28 +0000 (20:47 +0200)]
[CALC] Fix buttons transitions. Improve UI code readability. CORE-8526
- Improve code readability by using suitable UI function names.
Carlo-Bramini [Tue, 7 Aug 2018 17:58:28 +0000 (19:58 +0200)]
[CALC] Improvements and fixes for the numeric text output. CORE-8486
- Fixed bug 12.37 13/06/2009 into multiprecision display (unicode only).
- Fixed bug when calculator was closed with statistics dialog open.
- Fixed bug in XrY operator.
- Fixed error into conversion unit.
- Do not append decimal separator if "ERROR" messages are printed.
- Remove call to _tcslen() and use return value of GetDlgItemText() where possible.
Carlo-Bramini [Mon, 6 Aug 2018 19:11:59 +0000 (21:11 +0200)]
[CALC] Resource files formatting only.
Carlo-Bramini [Mon, 6 Aug 2018 19:00:43 +0000 (21:00 +0200)]
[CALC] Improve the handling of configuration settings. CORE-3085, CORE-8486
Configuration is read from WIN.INI under W32S/Win9x/Me and from the registry
for all NT platforms.
Although with INI file mapping the keys are still saved in the registry
even on NT, I added handling of different platforms for writing directly
the configuration in the right place.
Carlo-Bramini [Mon, 6 Aug 2018 18:23:12 +0000 (20:23 +0200)]
[CALC] Add theming support, requires Windows XP or later. CORE-13343
- Fix errors if a theme api is missing.
- Add callback to functions for drawing themed transparent background.
- Fix drawing glitch when theming is applied.
- Redraw on theme change: automatically redraw the window if the
theme is changed while the application is active.
- Colours are now declared though RGB() macro.
- Removed safe DS_SHELLFONT declaration.
Carlo-Bramini [Mon, 6 Aug 2018 18:22:36 +0000 (20:22 +0200)]
[CALC] Add support for HTML-Help. CORE-15019
Carlo-Bramini [Mon, 6 Aug 2018 17:58:23 +0000 (19:58 +0200)]
[CALC] Improve headers inclusion.
Carlo-Bramini [Mon, 6 Aug 2018 07:54:21 +0000 (09:54 +0200)]
[CALC] Improve multi-precision support, and powers/roots. CORE-8486
- Added support for average of squares and mean of squares into statistical functions.
- pop() and push() functions in RPN engines now work with nodes instead of stack units.
- Moved the POW and SQR operations near the operators.
CORE-12766
- Fix number of digits for IEEE-754 constants.
- Show all available digits in exp notation.
CORE-14871
- Update help correspondingly.
Carlo-Bramini [Mon, 6 Aug 2018 07:52:59 +0000 (09:52 +0200)]
[CALC] Rename files only.
Eric Kohl [Sun, 17 Mar 2019 16:51:32 +0000 (17:51 +0100)]
[USERENV] Implement GetProfileType().
Eric Kohl [Sun, 17 Mar 2019 11:44:54 +0000 (12:44 +0100)]
[USERENV] LoadUserProfileW: Check the user for Administators and Guests group membership and set the State value accordingly.
See https://www.pcreview.co.uk/threads/purpose-of-the-state-key-located-in-users-profiles.
2939114/post-
9722112
Eric Kohl [Sun, 17 Mar 2019 11:34:49 +0000 (12:34 +0100)]
[NETAPI32] NetUserEnum, NetUserGetInfo: Get the user privileges and auth flags for info levels 1, 2, 3, 4 and 11.
Eric Kohl [Sat, 16 Mar 2019 18:12:25 +0000 (19:12 +0100)]
[USERENV] Store the profiles load time, flags and state in the profile list.
Jared Smudde [Sat, 16 Mar 2019 14:37:56 +0000 (09:37 -0500)]
[SHELL32] Disable the Hardware tab in the properties dialog for Network drives (#1249)
This matches Windows behaviour.
Stanislav Motylkov [Sat, 9 Mar 2019 18:00:54 +0000 (21:00 +0300)]
[MEDIA][INF] Improve network adapter names
Daniele Campione [Sat, 16 Mar 2019 14:33:57 +0000 (15:33 +0100)]
[SNDVOL32] Small Italian translation update (#1415)
Serge Gautherie [Sat, 16 Mar 2019 10:23:27 +0000 (11:23 +0100)]
Merge pull request #1253 from SergeGautherie/SergeGautherie/PRonly_Log2Lines_handle_escape_cmd_Path-LineOut
[LOG2LINES] handle_escape_cmd(): Remove 2 unused parameters
Serge Gautherie [Wed, 16 Jan 2019 16:46:27 +0000 (17:46 +0100)]
[LOG2LINES] Add a TODO, Use a snprintf()
Addendum to
c5d8d8d.
Stanislav Motylkov [Thu, 7 Mar 2019 00:33:39 +0000 (03:33 +0300)]
[SYSDM] Update SMBIOS parsing code
Eric Kohl [Sat, 16 Mar 2019 06:45:30 +0000 (07:45 +0100)]
[USERENV] Use a reference counter when loading and unloading profiles. Unload the hive only when the reference counter reaches 0. This fixes the remaining bugs in "userenv_apitest LoadUserProfile".
Joachim Henze [Sat, 16 Mar 2019 01:11:00 +0000 (02:11 +0100)]
[COMCTL32] Combobox Implement logic for set and get dropdown height CORE-15833
by import of Wine commit
https://source.winehq.org/git/wine.git/commit/
313c63e194aebdd517b3a85f8fe4d83acf170b62
merged from current Wine head.
Thanks to patches author Fabian Maurer
and also Doug Lyons for tests and adding initial the merge-patch.