huwcampbell.com / reactos
Reactos
fork atom

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

Amine Khaldi cd3274d6 f1d3793c

+32 -7
+2 -2
dll/win32/sti/precomp.h
··· 1 + 1 2 #ifndef _STI_PCH_ 2 3 #define _STI_PCH_ 3 4 ··· 14 15 #include <sti.h> 15 16 16 17 #include <wine/debug.h> 17 - WINE_DEFAULT_DEBUG_CHANNEL(sti); 18 18 19 - #endif /* _STI_PCH_ */ 19 + #endif /* !_STI_PCH_ */
+13 -3
dll/win32/sti/sti.c
··· 17 17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 18 18 */ 19 19 20 - #include "precomp.h" 20 + #include <stdarg.h> 21 21 22 - #include <winreg.h> 22 + #define COBJMACROS 23 23 24 - #include <wine/unicode.h> 24 + #include "windef.h" 25 + #include "winbase.h" 26 + #include "winreg.h" 27 + #include "winerror.h" 28 + #include "objbase.h" 29 + #include "sti.h" 30 + 31 + #include "wine/debug.h" 32 + #include "wine/unicode.h" 33 + 34 + WINE_DEFAULT_DEBUG_CHANNEL(sti); 25 35 26 36 static const WCHAR registeredAppsLaunchPath[] = { 27 37 'S','O','F','T','W','A','R','E','\\',
+16 -1
dll/win32/sti/sti_main.c
··· 17 17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 18 18 */ 19 19 20 - #include "precomp.h" 20 + #include <stdarg.h> 21 + 22 + #define COBJMACROS 23 + 24 + #include "windef.h" 25 + #include "winbase.h" 26 + #include "winreg.h" 27 + #include "winerror.h" 28 + #include "objbase.h" 29 + #include "initguid.h" 30 + #include "wia_lh.h" 31 + #include "sti.h" 32 + 33 + #include "wine/debug.h" 34 + 35 + WINE_DEFAULT_DEBUG_CHANNEL(sti); 21 36 22 37 extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; 23 38 extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
+1 -1
media/doc/README.WINE
··· 180 180 reactos/dll/win32/softpub # Synced to WineStaging-2.9 181 181 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 182 182 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 183 - reactos/dll/win32/sti # Synced to WineStaging-2.9 183 + reactos/dll/win32/sti # Synced to WineStaging-3.3 184 184 reactos/dll/win32/sxs # Synced to WineStaging-2.16 185 185 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 186 186 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9