https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2b54264dc301cf14cac10ae465355cf0001a75a
commit b2b54264dc301cf14cac10ae465355cf0001a75a Author: Amine Khaldi <[email protected]> AuthorDate: Sun Mar 18 12:35:58 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Mar 18 12:35:58 2018 +0100 [MSRLE32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msrle32/msrle32.c | 6 +++--- dll/win32/msrle32/msrle_private.h | 16 ++++++---------- dll/win32/msrle32/rsrc.rc | 6 ++---- media/doc/README.WINE | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dll/win32/msrle32/msrle32.c b/dll/win32/msrle32/msrle32.c index 0cca8c1700..66880408d4 100644 --- a/dll/win32/msrle32/msrle32.c +++ b/dll/win32/msrle32/msrle32.c @@ -25,10 +25,10 @@ #include "msrle_private.h" -//#include "winnls.h" -//#include "winuser.h" +#include "winnls.h" +#include "winuser.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msrle32); diff --git a/dll/win32/msrle32/msrle_private.h b/dll/win32/msrle32/msrle_private.h index 88b9074026..d182fef1f0 100644 --- a/dll/win32/msrle32/msrle_private.h +++ b/dll/win32/msrle32/msrle_private.h @@ -19,20 +19,16 @@ #ifndef __MSRLE32_PRIVATE_H #define __MSRLE32_PRIVATE_H -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #ifndef RC_INVOKED #include <stdarg.h> #endif -#include <windef.h> -#include <winbase.h> -//#include "mmsystem.h" -#include <wingdi.h> -//#include "winuser.h" -#include <vfw.h> +#include "windef.h" +#include "winbase.h" +#include "mmsystem.h" +#include "wingdi.h" +#include "winuser.h" +#include "vfw.h" #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/dll/win32/msrle32/rsrc.rc b/dll/win32/msrle32/rsrc.rc index 680d6e653c..ffe5817620 100644 --- a/dll/win32/msrle32/rsrc.rc +++ b/dll/win32/msrle32/rsrc.rc @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" +#include "msrle_private.h" -//#include "msrle_private.h" /* * Everything specific to any language goes @@ -108,4 +106,4 @@ #endif #ifdef LANGUAGE_ZH_CN #include "lang/msrle_Zh.rc" -#endif \ No newline at end of file +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8f1f6dd332..355759c775 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -119,7 +119,7 @@ reactos/dll/win32/msisip # Synced to WineStaging-3.3 reactos/dll/win32/msisys.ocx # Synced to WineStaging-3.3 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 -reactos/dll/win32/msrle32 # Synced to WineStaging-2.9 +reactos/dll/win32/msrle32 # Synced to WineStaging-3.3 reactos/dll/win32/mssign32 # Synced to WineStaging-2.9 reactos/dll/win32/mssip32 # Synced to WineStaging-2.9 reactos/dll/win32/mstask # Synced to WineStaging-2.9
