https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd3274d64fe67f6e3f50b7...
commit cd3274d64fe67f6e3f50b770ddbcc82d36981a43 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 23 12:29:23 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 23 12:29:23 2018 +0100
[STI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/sti/precomp.h | 4 ++-- dll/win32/sti/sti.c | 16 +++++++++++++--- dll/win32/sti/sti_main.c | 17 ++++++++++++++++- media/doc/README.WINE | 2 +- 4 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/dll/win32/sti/precomp.h b/dll/win32/sti/precomp.h index 8c0b0f6342..d19191eb25 100644 --- a/dll/win32/sti/precomp.h +++ b/dll/win32/sti/precomp.h @@ -1,3 +1,4 @@ + #ifndef _STI_PCH_ #define _STI_PCH_
@@ -14,6 +15,5 @@ #include <sti.h>
#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(sti);
-#endif /* _STI_PCH_ */ +#endif /* !_STI_PCH_ */ diff --git a/dll/win32/sti/sti.c b/dll/win32/sti/sti.c index 147d9ae3d4..41c94f5753 100644 --- a/dll/win32/sti/sti.c +++ b/dll/win32/sti/sti.c @@ -17,11 +17,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" +#include <stdarg.h>
-#include <winreg.h> +#define COBJMACROS
-#include <wine/unicode.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "objbase.h" +#include "sti.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sti);
static const WCHAR registeredAppsLaunchPath[] = { 'S','O','F','T','W','A','R','E','\', diff --git a/dll/win32/sti/sti_main.c b/dll/win32/sti/sti_main.c index 291daebab7..c532ffbd6a 100644 --- a/dll/win32/sti/sti_main.c +++ b/dll/win32/sti/sti_main.c @@ -17,7 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" +#include "sti.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sti);
extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 550dadc687..d0c2a4297e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -180,7 +180,7 @@ reactos/dll/win32/snmpapi # Synced to WineStaging-3.3 reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 -reactos/dll/win32/sti # Synced to WineStaging-2.9 +reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-2.16 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9