https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4ab01b670a2bb40b2c372...
commit f4ab01b670a2bb40b2c37240dd163dc6db0e6317 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Apr 1 13:12:40 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Apr 1 13:12:40 2018 +0100
[EXPAND] Sync with Wine Staging 3.3. CORE-14434 --- base/system/expand/expand.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/base/system/expand/expand.c b/base/system/expand/expand.c index 6acfb63c0f..ea7bfdf80b 100644 --- a/base/system/expand/expand.c +++ b/base/system/expand/expand.c @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> +#include <string.h> +#include <windows.h> #include <lzexpand.h> #include <setupapi.h>
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8f54e3b2bb..e9b7d7e492 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -242,7 +242,7 @@ reactos/base/applications/winhlp32 # Synced to WineStaging-3.3 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-3.3 reactos/base/services/rpcss # Synced to WineStaging-3.3 -reactos/base/system/expand # Synced to WineStaging-2.9 +reactos/base/system/expand # Synced to WineStaging-3.3 reactos/base/system/msiexec # Synced to WineStaging-2.16 reactos/modules/rosapps/winfile # Autosync