https://git.reactos.org/?p=reactos.git;a=commitdiff;h=919215fd3bf52e5068ee8a77ac80a5198da95d22
commit 919215fd3bf52e5068ee8a77ac80a5198da95d22 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Mar 17 13:10:01 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Mar 17 13:10:01 2018 +0100 [ITSS] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/itss/chm_lib.c | 15 ++++++++++++++- dll/win32/itss/itss.c | 25 +++++++++++++++++++++++-- dll/win32/itss/lzx.c | 9 ++++++++- dll/win32/itss/moniker.c | 20 ++++++++++++++++++-- dll/win32/itss/precomp.h | 5 ++--- dll/win32/itss/protocol.c | 21 +++++++++++++++++---- dll/win32/itss/storage.c | 21 ++++++++++++++++++++- media/doc/README.WINE | 2 +- 8 files changed, 103 insertions(+), 15 deletions(-) diff --git a/dll/win32/itss/chm_lib.c b/dll/win32/itss/chm_lib.c index 12ba5fd0f2..829f758516 100644 --- a/dll/win32/itss/chm_lib.c +++ b/dll/win32/itss/chm_lib.c @@ -54,7 +54,20 @@ * * ***************************************************************************/ -#include "precomp.h" +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/unicode.h" + +#include "chm_lib.h" +#include "lzx.h" #define CHM_ACQUIRE_LOCK(a) do { \ EnterCriticalSection(&(a)); \ diff --git a/dll/win32/itss/itss.c b/dll/win32/itss/itss.c index c428c707e9..f47a0e96e7 100644 --- a/dll/win32/itss/itss.c +++ b/dll/win32/itss/itss.c @@ -21,9 +21,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" -#include <rpcproxy.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "advpub.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "itsstor.h" + +#include "initguid.h" +#include "wine/itss.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itss); static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); diff --git a/dll/win32/itss/lzx.c b/dll/win32/itss/lzx.c index 68b1e23f40..01a9492411 100644 --- a/dll/win32/itss/lzx.c +++ b/dll/win32/itss/lzx.c @@ -35,7 +35,14 @@ * ***************************************************************************/ -#include "precomp.h" +#include "lzx.h" +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" /* sized types */ typedef unsigned char UBYTE; /* 8 bits exactly */ diff --git a/dll/win32/itss/moniker.c b/dll/win32/itss/moniker.c index 86d8109186..0509c9e1a5 100644 --- a/dll/win32/itss/moniker.c +++ b/dll/win32/itss/moniker.c @@ -20,9 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" -#include <oleidl.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/itss.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "itsstor.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itss); /*****************************************************************************/ diff --git a/dll/win32/itss/precomp.h b/dll/win32/itss/precomp.h index 1bf6ab0c51..5f9be9183b 100644 --- a/dll/win32/itss/precomp.h +++ b/dll/win32/itss/precomp.h @@ -1,3 +1,4 @@ + #ifndef _ITSS_PCH_ #define _ITSS_PCH_ @@ -18,12 +19,10 @@ #include <wine/itss.h> #include <wine/unicode.h> - #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(itss); #include "chm_lib.h" #include "itsstor.h" #include "lzx.h" -#endif /* _ITSS_PCH_ */ +#endif /* !_ITSS_PCH_ */ diff --git a/dll/win32/itss/protocol.c b/dll/win32/itss/protocol.c index 603e2aee73..1463518c2c 100644 --- a/dll/win32/itss/protocol.c +++ b/dll/win32/itss/protocol.c @@ -16,11 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <winreg.h> -#include <urlmon.h> -#include <shlwapi.h> +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" +#include "urlmon.h" +#include "shlwapi.h" +#include "itsstor.h" +#include "chm_lib.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { IInternetProtocol IInternetProtocol_iface; diff --git a/dll/win32/itss/storage.c b/dll/win32/itss/storage.c index 0b10dc5238..f20c5bc0be 100644 --- a/dll/win32/itss/storage.c +++ b/dll/win32/itss/storage.c @@ -20,7 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "chm_lib.h" +#include "itsstor.h" + +#include "wine/itss.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itss); /************************************************************************/ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3e9ddc8bc8..93a5a04a6b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -84,7 +84,7 @@ reactos/dll/win32/initpki # Synced to WineStaging-3.3 reactos/dll/win32/inseng # Synced to WineStaging-3.3 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-3.3 -reactos/dll/win32/itss # Synced to Wine-3.0 +reactos/dll/win32/itss # Synced to WineStaging-3.3 reactos/dll/win32/jscript # Synced to Wine-3.0 reactos/dll/win32/jsproxy # Synced to WineStaging-2.16 reactos/dll/win32/loadperf # Synced to WineStaging-2.9
