[STI] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 23 Mar 2018 11:29:23 +0000 (12:29 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 23 Mar 2018 11:29:23 +0000 (12:29 +0100)
dll/win32/sti/precomp.h
dll/win32/sti/sti.c
dll/win32/sti/sti_main.c
media/doc/README.WINE

index 8c0b0f6..d19191e 100644 (file)
@@ -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_ */
index 147d9ae..41c94f5 100644 (file)
  * 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','\\',
index 291daeb..c532ffb 100644 (file)
  * 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;
index 550dadc..d0c2a42 100644 (file)
@@ -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