[STI] Sync with Wine Staging 3.3. CORE-14434

This commit is contained in:
Amine Khaldi 2018-03-23 12:29:23 +01:00
parent f1d3793c86
commit cd3274d64f
4 changed files with 32 additions and 7 deletions

View 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_ */

View file

@ -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','\\',

View file

@ -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;

View 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