https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bfbe4f57a92b1eff88942984b10e62b0592c6f0
commit 7bfbe4f57a92b1eff88942984b10e62b0592c6f0 Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 9 12:38:15 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 9 12:38:37 2018 +0100 [ACTIVEDS] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/activeds/activeds_main.c | 16 +++++++++++++--- dll/win32/activeds/precomp.h | 3 ++- media/doc/README.WINE | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dll/win32/activeds/activeds_main.c b/dll/win32/activeds/activeds_main.c index bb05cad564..15a329e99c 100644 --- a/dll/win32/activeds/activeds_main.c +++ b/dll/win32/activeds/activeds_main.c @@ -21,11 +21,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <iads.h> +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "objbase.h" +#include "iads.h" +#include "adshlp.h" + +#include "wine/unicode.h" +#include "wine/debug.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(activeds); /***************************************************** diff --git a/dll/win32/activeds/precomp.h b/dll/win32/activeds/precomp.h index 9edfce3faf..e91f4cf153 100644 --- a/dll/win32/activeds/precomp.h +++ b/dll/win32/activeds/precomp.h @@ -1,3 +1,4 @@ + #ifndef _ACTIVEDS_PCH_ #define _ACTIVEDS_PCH_ @@ -14,4 +15,4 @@ #include <winbase.h> #include <objbase.h> -#endif /* _ACTIVEDS_PCH_ */ +#endif /* !_ACTIVEDS_PCH_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index cd4452c42d..50de61d5f4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -42,7 +42,7 @@ reactos/dll/directx/wine/qedit # Synced to WineStaging-3.3 reactos/dll/directx/wine/quartz # Synced to WineStaging-3.3 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.3 -reactos/dll/win32/activeds # Synced to WineStaging-2.9 +reactos/dll/win32/activeds # Synced to WineStaging-3.3 reactos/dll/win32/actxprxy # Synced to WineStaging-2.9 reactos/dll/win32/advpack # Synced to WineStaging-2.9 reactos/dll/win32/atl # Synced to Wine-3.0
