https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ac662291e648703c96044...
commit 8ac662291e648703c960448098187d327a4776d3 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Mar 25 12:58:56 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Mar 25 12:58:56 2018 +0100
[EXTRAC32] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/extrac32/extrac32.c | 6 +++--- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/base/applications/extrac32/extrac32.c b/base/applications/extrac32/extrac32.c index 15d2603789..63205e8176 100644 --- a/base/applications/extrac32/extrac32.c +++ b/base/applications/extrac32/extrac32.c @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> #include <shlobj.h> -#include <wine/unicode.h> -#include <wine/debug.h> + +#include "wine/unicode.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(extrac32);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 879cb70a37..c0ddf543e1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -234,7 +234,7 @@ reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-2.9 +reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/iexplore # Synced to WineStaging-2.9 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync