Update to 20151224 snapshot (git rev 5e2e73)
This commit is contained in:
Erik van Pienbroek
parent
cd58c578fa
commit
f757392dda
1
.gitignore
vendored
1
.gitignore
vendored
@ -57,3 +57,4 @@
|
||||
/mingw-w64-v4.0.1.tar.bz2
|
||||
/mingw-w64-v4.0.2.tar.bz2
|
||||
/mingw-w64-v4.0.4.tar.bz2
|
||||
/mingw-w64-mingw-w64-5e2e73b7754fca77ef7635cf52c73a3885110603.zip
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 21c9cbf172902f29bf5797e3ebae206ee714b46e Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Mon, 6 Jul 2015 11:56:52 +0200
|
||||
Subject: winstring.h: Added extern "C" for functions that need it and removed
|
||||
version guards.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/winstring.h b/mingw-w64-headers/include/winstring.h
|
||||
index c37097c..908923e 100644
|
||||
--- a/mingw-w64-headers/include/winstring.h
|
||||
+++ b/mingw-w64-headers/include/winstring.h
|
||||
@@ -11,7 +11,9 @@
|
||||
#include <rpc.h>
|
||||
#include <hstring.h>
|
||||
|
||||
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
void __RPC_USER HSTRING_UserFree(unsigned long *pFlags, HSTRING *ppidl);
|
||||
|
||||
@@ -31,7 +33,9 @@ unsigned long __RPC_USER HSTRING_UserSize64(unsigned long *pFlags, unsigned long
|
||||
unsigned char* __RPC_USER HSTRING_UserUnmarshal64(unsigned long *pFlags, unsigned char *pBuffer, HSTRING *ppidl);
|
||||
#endif
|
||||
|
||||
-/* */
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING string1, HSTRING string2, INT32 *result);
|
||||
|
||||
@@ -74,4 +78,3 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING string, HSTRING trimString, HSTRING
|
||||
HRESULT WINAPI WindowsTrimStringStart(HSTRING string, HSTRING trimString, HSTRING *newString);
|
||||
|
||||
#endif
|
||||
-#endif
|
||||
@ -1,56 +0,0 @@
|
||||
From 4ce7a79ee9b1099f9762ee7a4d9f7ad1bbc01bc9 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Fri, 22 May 2015 16:25:01 +0200
|
||||
Subject: Install *.c files as headers as well.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
|
||||
index a8f0990..2e66933 100644
|
||||
--- a/mingw-w64-headers/Makefile.am
|
||||
+++ b/mingw-w64-headers/Makefile.am
|
||||
@@ -36,6 +36,7 @@ dist-hook:
|
||||
find $(distdir) -name ".svn" -type d -delete
|
||||
|
||||
EXTRA_HEADERS = \
|
||||
+ include/*.c \
|
||||
include/*.dlg \
|
||||
include/*.h \
|
||||
include/*.h16 \
|
||||
diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in
|
||||
index 901ff18..f0b4066 100644
|
||||
--- a/mingw-w64-headers/Makefile.in
|
||||
+++ b/mingw-w64-headers/Makefile.in
|
||||
@@ -262,6 +262,7 @@ CLEANFILES = $(nodist_sdkshead_HEADERS)
|
||||
DISTCHECK_CONFIGURE_FLAGS = --enable-crt --enable-sdk=all --enable-idl
|
||||
EXTRA_DIST = $(srcdir)/ChangeLog.* include crt direct-x ddk
|
||||
EXTRA_HEADERS = \
|
||||
+ include/*.c \
|
||||
include/*.dlg \
|
||||
include/*.h \
|
||||
include/*.h16 \
|
||||
diff --git a/mingw-w64-headers/configure b/mingw-w64-headers/configure
|
||||
index 8de18ee..abc4d42 100755
|
||||
--- a/mingw-w64-headers/configure
|
||||
+++ b/mingw-w64-headers/configure
|
||||
@@ -2547,7 +2547,7 @@ fi
|
||||
|
||||
BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/intrin.h crt/vadefs.h crt/tchar.h "$srcdir/include/*.h
|
||||
SECHEAD_LIST="$srcdir/crt/sec_api/stralign_s.h"
|
||||
-for i in dlg h16 hxx rh ver; do
|
||||
+for i in c dlg h16 hxx rh ver; do
|
||||
BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/include/*.$i
|
||||
done
|
||||
#FIXME: Add in base directx
|
||||
diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
|
||||
index 312cf0a..7e3863d 100644
|
||||
--- a/mingw-w64-headers/configure.ac
|
||||
+++ b/mingw-w64-headers/configure.ac
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
BASEHEAD_LIST="crt/_bsd_types.h crt/_cygwin.h crt/_mingw.h crt/_mingw_mac.h crt/_mingw_print_push.h crt/_mingw_print_pop.h crt/_mingw_secapi.h crt/_mingw_unicode.h crt/_timeval.h crt/crtdefs.h crt/excpt.h crt/intrin.h crt/vadefs.h crt/tchar.h "$srcdir/include/*.h
|
||||
SECHEAD_LIST="$srcdir/crt/sec_api/stralign_s.h"
|
||||
-for i in dlg h16 hxx rh ver; do
|
||||
+for i in c dlg h16 hxx rh ver; do
|
||||
BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/include/*.$i
|
||||
done
|
||||
#FIXME: Add in base directx
|
||||
366
commit-58b571e
366
commit-58b571e
@ -1,366 +0,0 @@
|
||||
From 58b571ec74923c34074bf1ff43d4093c27375312 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Mon, 20 Jul 2015 18:15:11 +0200
|
||||
Subject: Added new wrl.h file and a few its dependency headers.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
|
||||
index f2981de..e0f60fa 100644
|
||||
--- a/mingw-w64-headers/Makefile.am
|
||||
+++ b/mingw-w64-headers/Makefile.am
|
||||
@@ -5,6 +5,8 @@ secheaddir = $(baseheaddir)/sec_api
|
||||
secsysheaddir = $(baseheaddir)/sec_api/sys
|
||||
glheaddir = $(baseheaddir)/GL
|
||||
gdiplusheaddir = $(baseheaddir)/gdiplus
|
||||
+wrlheaddir = $(baseheaddir)/wrl
|
||||
+wrlwrappersheaddir = $(baseheaddir)/wrl/wrappers
|
||||
mingwhelperheaddir = $(baseheaddir)/psdk_inc
|
||||
sdksheaddir = $(baseheaddir)/sdks
|
||||
|
||||
@@ -14,6 +16,8 @@ sechead_HEADERS = @SECHEAD_LIST@
|
||||
secsyshead_HEADERS = @SECSYSHEAD_LIST@
|
||||
glhead_HEADERS = @GLHEAD_LIST@
|
||||
gdiplushead_HEADERS = @GDIPLUSHEAD_LIST@
|
||||
+wrlhead_HEADERS = @WRLHEAD_LIST@
|
||||
+wrlwrappershead_HEADERS = @WRLWRAPPERSHEAD_LIST@
|
||||
mingwhelperhead_HEADERS = @MINGWHELPERHEAD_LIST@
|
||||
nodist_sdkshead_HEADERS = _mingw_directx.h _mingw_ddk.h
|
||||
noinst_HEADERS = crt/sdks/_mingw_directx.h.in crt/sdks/_mingw_ddk.h.in
|
||||
@@ -47,6 +51,8 @@ EXTRA_HEADERS = \
|
||||
include/GL/*.h \
|
||||
include/psdk_inc/*.h \
|
||||
include/gdiplus/*.h \
|
||||
+ include/wrl/*.h \
|
||||
+ include/wrl/wrappers/*.h \
|
||||
crt/*.h \
|
||||
crt/*.inl \
|
||||
crt/sys/*.h \
|
||||
diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in
|
||||
index d6d3cee..c628b25 100644
|
||||
--- a/mingw-w64-headers/Makefile.in
|
||||
+++ b/mingw-w64-headers/Makefile.in
|
||||
@@ -61,7 +61,8 @@ DIST_COMMON = $(am__configure_deps) $(basehead_HEADERS) \
|
||||
$(top_srcdir)/build-aux/config.sub \
|
||||
$(top_srcdir)/build-aux/install-sh \
|
||||
$(top_srcdir)/build-aux/missing $(top_srcdir)/configure \
|
||||
- $(top_srcdir)/crt/_mingw.h.in ChangeLog build-aux/config.guess \
|
||||
+ $(top_srcdir)/crt/_mingw.h.in $(wrlhead_HEADERS) \
|
||||
+ $(wrlwrappershead_HEADERS) ChangeLog build-aux/config.guess \
|
||||
build-aux/config.sub build-aux/install-sh build-aux/missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -112,12 +113,14 @@ am__installdirs = "$(DESTDIR)$(baseheaddir)" "$(DESTDIR)$(ddkheaddir)" \
|
||||
"$(DESTDIR)$(glheaddir)" "$(DESTDIR)$(idlheaddir)" \
|
||||
"$(DESTDIR)$(mingwhelperheaddir)" "$(DESTDIR)$(sdksheaddir)" \
|
||||
"$(DESTDIR)$(secheaddir)" "$(DESTDIR)$(secsysheaddir)" \
|
||||
- "$(DESTDIR)$(sysheaddir)"
|
||||
+ "$(DESTDIR)$(sysheaddir)" "$(DESTDIR)$(wrlheaddir)" \
|
||||
+ "$(DESTDIR)$(wrlwrappersheaddir)"
|
||||
HEADERS = $(basehead_HEADERS) $(ddkhead_HEADERS) $(dxhead_HEADERS) \
|
||||
$(gdiplushead_HEADERS) $(glhead_HEADERS) $(idlhead_HEADERS) \
|
||||
$(mingwhelperhead_HEADERS) $(nodist_sdkshead_HEADERS) \
|
||||
$(noinst_HEADERS) $(sechead_HEADERS) $(secsyshead_HEADERS) \
|
||||
- $(syshead_HEADERS)
|
||||
+ $(syshead_HEADERS) $(wrlhead_HEADERS) \
|
||||
+ $(wrlwrappershead_HEADERS)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
@@ -188,6 +191,8 @@ STRIP = @STRIP@
|
||||
SYSHEAD_LIST = @SYSHEAD_LIST@
|
||||
VERSION = @VERSION@
|
||||
WIDL = @WIDL@
|
||||
+WRLHEAD_LIST = @WRLHEAD_LIST@
|
||||
+WRLWRAPPERSHEAD_LIST = @WRLWRAPPERSHEAD_LIST@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
@@ -241,6 +246,8 @@ secheaddir = $(baseheaddir)/sec_api
|
||||
secsysheaddir = $(baseheaddir)/sec_api/sys
|
||||
glheaddir = $(baseheaddir)/GL
|
||||
gdiplusheaddir = $(baseheaddir)/gdiplus
|
||||
+wrlheaddir = $(baseheaddir)/wrl
|
||||
+wrlwrappersheaddir = $(baseheaddir)/wrl/wrappers
|
||||
mingwhelperheaddir = $(baseheaddir)/psdk_inc
|
||||
sdksheaddir = $(baseheaddir)/sdks
|
||||
basehead_HEADERS = @BASEHEAD_LIST@
|
||||
@@ -249,6 +256,8 @@ sechead_HEADERS = @SECHEAD_LIST@
|
||||
secsyshead_HEADERS = @SECSYSHEAD_LIST@
|
||||
glhead_HEADERS = @GLHEAD_LIST@
|
||||
gdiplushead_HEADERS = @GDIPLUSHEAD_LIST@
|
||||
+wrlhead_HEADERS = @WRLHEAD_LIST@
|
||||
+wrlwrappershead_HEADERS = @WRLWRAPPERSHEAD_LIST@
|
||||
mingwhelperhead_HEADERS = @MINGWHELPERHEAD_LIST@
|
||||
nodist_sdkshead_HEADERS = _mingw_directx.h _mingw_ddk.h
|
||||
noinst_HEADERS = crt/sdks/_mingw_directx.h.in crt/sdks/_mingw_ddk.h.in
|
||||
@@ -273,6 +282,8 @@ EXTRA_HEADERS = \
|
||||
include/GL/*.h \
|
||||
include/psdk_inc/*.h \
|
||||
include/gdiplus/*.h \
|
||||
+ include/wrl/*.h \
|
||||
+ include/wrl/wrappers/*.h \
|
||||
crt/*.h \
|
||||
crt/*.inl \
|
||||
crt/sys/*.h \
|
||||
@@ -714,6 +725,48 @@ uninstall-sysheadHEADERS:
|
||||
@list='$(syshead_HEADERS)'; test -n "$(sysheaddir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(sysheaddir)'; $(am__uninstall_files_from_dir)
|
||||
+install-wrlheadHEADERS: $(wrlhead_HEADERS)
|
||||
+ @$(NORMAL_INSTALL)
|
||||
+ @list='$(wrlhead_HEADERS)'; test -n "$(wrlheaddir)" || list=; \
|
||||
+ if test -n "$$list"; then \
|
||||
+ echo " $(MKDIR_P) '$(DESTDIR)$(wrlheaddir)'"; \
|
||||
+ $(MKDIR_P) "$(DESTDIR)$(wrlheaddir)" || exit 1; \
|
||||
+ fi; \
|
||||
+ for p in $$list; do \
|
||||
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
+ echo "$$d$$p"; \
|
||||
+ done | $(am__base_list) | \
|
||||
+ while read files; do \
|
||||
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(wrlheaddir)'"; \
|
||||
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(wrlheaddir)" || exit $$?; \
|
||||
+ done
|
||||
+
|
||||
+uninstall-wrlheadHEADERS:
|
||||
+ @$(NORMAL_UNINSTALL)
|
||||
+ @list='$(wrlhead_HEADERS)'; test -n "$(wrlheaddir)" || list=; \
|
||||
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
+ dir='$(DESTDIR)$(wrlheaddir)'; $(am__uninstall_files_from_dir)
|
||||
+install-wrlwrappersheadHEADERS: $(wrlwrappershead_HEADERS)
|
||||
+ @$(NORMAL_INSTALL)
|
||||
+ @list='$(wrlwrappershead_HEADERS)'; test -n "$(wrlwrappersheaddir)" || list=; \
|
||||
+ if test -n "$$list"; then \
|
||||
+ echo " $(MKDIR_P) '$(DESTDIR)$(wrlwrappersheaddir)'"; \
|
||||
+ $(MKDIR_P) "$(DESTDIR)$(wrlwrappersheaddir)" || exit 1; \
|
||||
+ fi; \
|
||||
+ for p in $$list; do \
|
||||
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
+ echo "$$d$$p"; \
|
||||
+ done | $(am__base_list) | \
|
||||
+ while read files; do \
|
||||
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(wrlwrappersheaddir)'"; \
|
||||
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(wrlwrappersheaddir)" || exit $$?; \
|
||||
+ done
|
||||
+
|
||||
+uninstall-wrlwrappersheadHEADERS:
|
||||
+ @$(NORMAL_UNINSTALL)
|
||||
+ @list='$(wrlwrappershead_HEADERS)'; test -n "$(wrlwrappersheaddir)" || list=; \
|
||||
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
+ dir='$(DESTDIR)$(wrlwrappersheaddir)'; $(am__uninstall_files_from_dir)
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@@ -955,7 +1008,7 @@ check: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||||
all-am: Makefile $(HEADERS) config.h
|
||||
installdirs:
|
||||
- for dir in "$(DESTDIR)$(baseheaddir)" "$(DESTDIR)$(ddkheaddir)" "$(DESTDIR)$(dxheaddir)" "$(DESTDIR)$(gdiplusheaddir)" "$(DESTDIR)$(glheaddir)" "$(DESTDIR)$(idlheaddir)" "$(DESTDIR)$(mingwhelperheaddir)" "$(DESTDIR)$(sdksheaddir)" "$(DESTDIR)$(secheaddir)" "$(DESTDIR)$(secsysheaddir)" "$(DESTDIR)$(sysheaddir)"; do \
|
||||
+ for dir in "$(DESTDIR)$(baseheaddir)" "$(DESTDIR)$(ddkheaddir)" "$(DESTDIR)$(dxheaddir)" "$(DESTDIR)$(gdiplusheaddir)" "$(DESTDIR)$(glheaddir)" "$(DESTDIR)$(idlheaddir)" "$(DESTDIR)$(mingwhelperheaddir)" "$(DESTDIR)$(sdksheaddir)" "$(DESTDIR)$(secheaddir)" "$(DESTDIR)$(secsysheaddir)" "$(DESTDIR)$(sysheaddir)" "$(DESTDIR)$(wrlheaddir)" "$(DESTDIR)$(wrlwrappersheaddir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
@@ -1017,7 +1070,8 @@ install-data-am: install-baseheadHEADERS install-ddkheadHEADERS \
|
||||
install-glheadHEADERS install-idlheadHEADERS \
|
||||
install-mingwhelperheadHEADERS install-nodist_sdksheadHEADERS \
|
||||
install-secheadHEADERS install-secsysheadHEADERS \
|
||||
- install-sysheadHEADERS
|
||||
+ install-sysheadHEADERS install-wrlheadHEADERS \
|
||||
+ install-wrlwrappersheadHEADERS
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
@@ -1068,7 +1122,8 @@ uninstall-am: uninstall-baseheadHEADERS uninstall-ddkheadHEADERS \
|
||||
uninstall-glheadHEADERS uninstall-idlheadHEADERS \
|
||||
uninstall-mingwhelperheadHEADERS \
|
||||
uninstall-nodist_sdksheadHEADERS uninstall-secheadHEADERS \
|
||||
- uninstall-secsysheadHEADERS uninstall-sysheadHEADERS
|
||||
+ uninstall-secsysheadHEADERS uninstall-sysheadHEADERS \
|
||||
+ uninstall-wrlheadHEADERS uninstall-wrlwrappersheadHEADERS
|
||||
|
||||
.MAKE: all check install install-am install-strip
|
||||
|
||||
@@ -1088,6 +1143,7 @@ uninstall-am: uninstall-baseheadHEADERS uninstall-ddkheadHEADERS \
|
||||
install-nodist_sdksheadHEADERS install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-secheadHEADERS \
|
||||
install-secsysheadHEADERS install-strip install-sysheadHEADERS \
|
||||
+ install-wrlheadHEADERS install-wrlwrappersheadHEADERS \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
|
||||
pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
@@ -1096,7 +1152,8 @@ uninstall-am: uninstall-baseheadHEADERS uninstall-ddkheadHEADERS \
|
||||
uninstall-glheadHEADERS uninstall-idlheadHEADERS \
|
||||
uninstall-mingwhelperheadHEADERS \
|
||||
uninstall-nodist_sdksheadHEADERS uninstall-secheadHEADERS \
|
||||
- uninstall-secsysheadHEADERS uninstall-sysheadHEADERS
|
||||
+ uninstall-secsysheadHEADERS uninstall-sysheadHEADERS \
|
||||
+ uninstall-wrlheadHEADERS uninstall-wrlwrappersheadHEADERS
|
||||
|
||||
|
||||
dist-hook:
|
||||
diff --git a/mingw-w64-headers/configure b/mingw-w64-headers/configure
|
||||
index fcf99e3..1bd5c64 100755
|
||||
--- a/mingw-w64-headers/configure
|
||||
+++ b/mingw-w64-headers/configure
|
||||
@@ -599,6 +599,8 @@ SECHEAD_LIST
|
||||
SYSHEAD_LIST
|
||||
MINGWHELPERHEAD_LIST
|
||||
GLHEAD_LIST
|
||||
+WRLWRAPPERSHEAD_LIST
|
||||
+WRLHEAD_LIST
|
||||
GDIPLUSHEAD_LIST
|
||||
BASEHEAD_LIST
|
||||
ENABLE_CRT_FALSE
|
||||
@@ -2610,6 +2612,8 @@ if test "x$enable_crt" = xyes; then :
|
||||
|
||||
fi
|
||||
GDIPLUSHEAD_LIST=$srcdir/include/gdiplus/*.h
|
||||
+WRLHEAD_LIST=$srcdir/include/wrl/*.h
|
||||
+WRLWRAPPERSHEAD_LIST=$srcdir/include/wrl/wrappers/*.h
|
||||
GLHEAD_LIST=$srcdir/include/GL/*.h
|
||||
MINGWHELPERHEAD_LIST=$srcdir/include/psdk_inc/*.h
|
||||
|
||||
@@ -2620,6 +2624,8 @@ MINGWHELPERHEAD_LIST=$srcdir/include/psdk_inc/*.h
|
||||
|
||||
|
||||
|
||||
+
|
||||
+
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional sdk headers" >&5
|
||||
$as_echo_n "checking for optional sdk headers... " >&6; }
|
||||
# Check whether --enable-sdk was given.
|
||||
diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
|
||||
index 7de20fd..41bb952 100644
|
||||
--- a/mingw-w64-headers/configure.ac
|
||||
+++ b/mingw-w64-headers/configure.ac
|
||||
@@ -76,10 +76,14 @@ AS_VAR_IF([enable_crt],[yes],[
|
||||
SECSYSHEAD_LIST=$srcdir/crt/sec_api/sys/*.h
|
||||
])
|
||||
GDIPLUSHEAD_LIST=$srcdir/include/gdiplus/*.h
|
||||
+WRLHEAD_LIST=$srcdir/include/wrl/*.h
|
||||
+WRLWRAPPERSHEAD_LIST=$srcdir/include/wrl/wrappers/*.h
|
||||
GLHEAD_LIST=$srcdir/include/GL/*.h
|
||||
MINGWHELPERHEAD_LIST=$srcdir/include/psdk_inc/*.h
|
||||
AC_SUBST([BASEHEAD_LIST])
|
||||
AC_SUBST([GDIPLUSHEAD_LIST])
|
||||
+AC_SUBST([WRLHEAD_LIST])
|
||||
+AC_SUBST([WRLWRAPPERSHEAD_LIST])
|
||||
AC_SUBST([GLHEAD_LIST])
|
||||
AC_SUBST([MINGWHELPERHEAD_LIST])
|
||||
AC_SUBST([SYSHEAD_LIST])
|
||||
diff --git a/mingw-w64-headers/include/wrl.h b/mingw-w64-headers/include/wrl.h
|
||||
new file mode 100644
|
||||
index 0000000..be147fe
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/wrl.h
|
||||
@@ -0,0 +1,15 @@
|
||||
+/**
|
||||
+ * This file has no copyright assigned and is placed in the Public Domain.
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _WRL_H_
|
||||
+#define _WRL_H_
|
||||
+
|
||||
+#include <wrl/client.h>
|
||||
+/* #include <wrl/implements.h> */
|
||||
+#include <wrl/module.h>
|
||||
+/* #include <wrl/event.h> */
|
||||
+
|
||||
+#endif
|
||||
diff --git a/mingw-w64-headers/include/wrl/client.h b/mingw-w64-headers/include/wrl/client.h
|
||||
new file mode 100644
|
||||
index 0000000..3cc2685
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/wrl/client.h
|
||||
@@ -0,0 +1,18 @@
|
||||
+/**
|
||||
+ * This file has no copyright assigned and is placed in the Public Domain.
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _WRL_CLIENT_H_
|
||||
+#define _WRL_CLIENT_H_
|
||||
+
|
||||
+#include <stddef.h>
|
||||
+#include <unknwn.h>
|
||||
+/* #include <weakreference.h> */
|
||||
+#include <roapi.h>
|
||||
+
|
||||
+/* #include <wrl/def.h> */
|
||||
+#include <wrl/internal.h>
|
||||
+
|
||||
+#endif
|
||||
diff --git a/mingw-w64-headers/include/wrl/internal.h b/mingw-w64-headers/include/wrl/internal.h
|
||||
new file mode 100644
|
||||
index 0000000..81bf347
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/wrl/internal.h
|
||||
@@ -0,0 +1,12 @@
|
||||
+/**
|
||||
+ * This file has no copyright assigned and is placed in the Public Domain.
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _WRL_INTERNAL_H_
|
||||
+#define _WRL_INTERNAL_H_
|
||||
+
|
||||
+#include <windows.h>
|
||||
+
|
||||
+#endif
|
||||
diff --git a/mingw-w64-headers/include/wrl/module.h b/mingw-w64-headers/include/wrl/module.h
|
||||
new file mode 100644
|
||||
index 0000000..4ac93ca
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/wrl/module.h
|
||||
@@ -0,0 +1,23 @@
|
||||
+/**
|
||||
+ * This file has no copyright assigned and is placed in the Public Domain.
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _WRL_MODULE_H_
|
||||
+#define _WRL_MODULE_H_
|
||||
+
|
||||
+#include <roapi.h>
|
||||
+#include <activation.h>
|
||||
+#include <winstring.h>
|
||||
+#include <intrin.h>
|
||||
+#include <winapifamily.h>
|
||||
+
|
||||
+/* #include <wrl/def.h> */
|
||||
+#include <wrl/internal.h>
|
||||
+#include <wrl/client.h>
|
||||
+/* #include <wrl/implements.h> */
|
||||
+/* #include <wrl/ftm.h> */
|
||||
+#include <wrl/wrappers/corewrappers.h>
|
||||
+
|
||||
+#endif
|
||||
diff --git a/mingw-w64-headers/include/wrl/wrappers/corewrappers.h b/mingw-w64-headers/include/wrl/wrappers/corewrappers.h
|
||||
new file mode 100644
|
||||
index 0000000..e63d5e9
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/wrl/wrappers/corewrappers.h
|
||||
@@ -0,0 +1,18 @@
|
||||
+/**
|
||||
+ * This file has no copyright assigned and is placed in the Public Domain.
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _WRL_COREWRAPPERS_H_
|
||||
+#define _WRL_COREWRAPPERS_H_
|
||||
+
|
||||
+#include <windows.h>
|
||||
+/* #include <intsafe.h> */
|
||||
+#include <winstring.h>
|
||||
+#include <roapi.h>
|
||||
+
|
||||
+/* #include <wrl/def.h> */
|
||||
+#include <wrl/internal.h>
|
||||
+
|
||||
+#endif
|
||||
@ -1,86 +0,0 @@
|
||||
From 5f5e2c1e8b742c64f628b7239312cf2e162077f6 Mon Sep 17 00:00:00 2001
|
||||
From: Alexpux <alexey.pawlow@gmail.com>
|
||||
Date: Thu, 2 Jul 2015 09:04:12 +0300
|
||||
Subject: activscp: Remove duplicate defines.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/activscp.h b/mingw-w64-headers/include/activscp.h
|
||||
index 847290e..cf93d7a 100644
|
||||
--- a/mingw-w64-headers/include/activscp.h
|
||||
+++ b/mingw-w64-headers/include/activscp.h
|
||||
@@ -175,35 +175,9 @@ extern "C" {
|
||||
DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
DEFINE_GUID(CATID_ActiveScriptParse, 0xf0b7a1a2, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
DEFINE_GUID(CATID_ActiveScriptEncode, 0xf0b7a1a3, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScript, 0xbb1a2ae1, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptParse32, 0xbb1a2ae2, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptParse64, 0xc7ef7658, 0xe1ee, 0x480e, 0x97, 0xea, 0xd5, 0x2c, 0xb4, 0xd7, 0x6d, 0x17);
|
||||
-DEFINE_GUID(IID_IActiveScriptEncode, 0xbb1a2ae3, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptHostEncode, 0xbee9b76e, 0xcfe3, 0x11d1, 0xb7, 0x47, 0x00, 0xc0, 0x4f, 0xc2, 0xb0, 0x85);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedureOld32, 0x1cff0050, 0x6fdd, 0x11d0, 0x93, 0x28, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedureOld64, 0x21f57128, 0x08c9, 0x4638, 0xba, 0x12, 0x22, 0xd1, 0x5d, 0x88, 0xdc, 0x5c);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedure32, 0xaa5b6a80, 0xb834, 0x11d0, 0x93, 0x2f, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedure64, 0xc64713b6, 0xe029, 0x4cc5, 0x92, 0x00, 0x43, 0x8b, 0x72, 0x89, 0x0b, 0x6a);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedure2_32, 0x71ee5b20, 0xfb04, 0x11d1, 0xb3, 0xa8, 0x00, 0xa0, 0xc9, 0x11, 0xe8, 0xb2);
|
||||
-DEFINE_GUID(IID_IActiveScriptParseProcedure2_64, 0xfe7c4271, 0x210c, 0x448d, 0x9f, 0x54, 0x76, 0xda, 0xb7, 0x04, 0x7b, 0x28);
|
||||
-DEFINE_GUID(IID_IActiveScriptSite, 0xdb01a1e3, 0xa42b, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptSiteTraceInfo, 0x4b7272ae, 0x1955, 0x4bfe, 0x98, 0xb0, 0x78, 0x6, 0x21, 0x88, 0x85, 0x69);
|
||||
-DEFINE_GUID(IID_IActiveScriptSiteWindow, 0xd10f6761, 0x83e9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptSiteInterruptPoll, 0x539698a0, 0xcdca, 0x11cf, 0xa5, 0xeb, 0x00, 0xaa, 0x00, 0x47, 0xa0, 0x63);
|
||||
-DEFINE_GUID(IID_IActiveScriptSiteUIControl, 0xaedae97e, 0xd7ee, 0x4796, 0xb9, 0x60, 0x7f, 0x9, 0x2a, 0xe8, 0x44, 0xab);
|
||||
-DEFINE_GUID(IID_IActiveScriptError, 0xeae1ba61, 0xa4ed, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
|
||||
-DEFINE_GUID(IID_IActiveScriptError64, 0xb21fb2a1, 0x5b8f, 0x4963, 0x8c, 0x21, 0x21, 0x45, 0x0f, 0x84, 0xed, 0x7f);
|
||||
-DEFINE_GUID(IID_IBindEventHandler, 0x63cdbcb0, 0xc1b1, 0x11d0, 0x93, 0x36, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);
|
||||
-DEFINE_GUID(IID_IActiveScriptStats, 0xb8da6310, 0xe19b, 0x11d0, 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);
|
||||
-DEFINE_GUID(IID_IActiveScriptProperty, 0x4954E0D0, 0xFBC7, 0x11D1, 0x84, 0x10, 0x00, 0x60, 0x08, 0xC3, 0xFB, 0xFC);
|
||||
-DEFINE_GUID(IID_ITridentEventSink, 0x1dc9ca50, 0x6ef, 0x11d2, 0x84, 0x15, 0x00, 0x60, 0x08, 0xc3, 0xfb, 0xfc);
|
||||
-DEFINE_GUID(IID_IActiveScriptGarbageCollector, 0x6aa2c4a0, 0x2b53, 0x11d4, 0xa2, 0xa0, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);
|
||||
-DEFINE_GUID(IID_IActiveScriptSIPInfo, 0x764651d0, 0x38de, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);
|
||||
-DEFINE_GUID(IID_IActiveScriptTraceInfo, 0xC35456E7, 0xBEBF, 0x4a1b, 0x86, 0xA9, 0x24, 0xD5, 0x6B, 0xE8, 0xB3, 0x69);
|
||||
DEFINE_GUID(OID_VBSSIP, 0x1629f04e, 0x2799, 0x4db5, 0x8f, 0xe5, 0xac, 0xe1, 0x0f, 0x17, 0xeb, 0xab);
|
||||
DEFINE_GUID(OID_JSSIP, 0x6c9e010, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);
|
||||
DEFINE_GUID(OID_WSFSIP, 0x1a610570, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);
|
||||
-DEFINE_GUID(IID_IActiveScriptStringCompare, 0x58562769, 0xED52, 0x42f7, 0x84, 0x03, 0x49, 0x63, 0x51, 0x4E, 0x1F, 0x11);
|
||||
#endif
|
||||
|
||||
#define SCRIPTITEM_ISVISIBLE 0x00000002
|
||||
diff --git a/mingw-w64-headers/include/activscp.idl b/mingw-w64-headers/include/activscp.idl
|
||||
index be17c66..c979b53 100755
|
||||
--- a/mingw-w64-headers/include/activscp.idl
|
||||
+++ b/mingw-w64-headers/include/activscp.idl
|
||||
@@ -23,35 +23,9 @@ cpp_quote("")
|
||||
cpp_quote("DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
cpp_quote("DEFINE_GUID(CATID_ActiveScriptParse, 0xf0b7a1a2, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
cpp_quote("DEFINE_GUID(CATID_ActiveScriptEncode, 0xf0b7a1a3, 0x9847, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScript, 0xbb1a2ae1, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParse32, 0xbb1a2ae2, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParse64, 0xc7ef7658, 0xe1ee, 0x480e, 0x97, 0xea, 0xd5, 0x2c, 0xb4, 0xd7, 0x6d, 0x17);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptEncode, 0xbb1a2ae3, 0xa4f9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptHostEncode, 0xbee9b76e, 0xcfe3, 0x11d1, 0xb7, 0x47, 0x00, 0xc0, 0x4f, 0xc2, 0xb0, 0x85);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedureOld32, 0x1cff0050, 0x6fdd, 0x11d0, 0x93, 0x28, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedureOld64, 0x21f57128, 0x08c9, 0x4638, 0xba, 0x12, 0x22, 0xd1, 0x5d, 0x88, 0xdc, 0x5c);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedure32, 0xaa5b6a80, 0xb834, 0x11d0, 0x93, 0x2f, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedure64, 0xc64713b6, 0xe029, 0x4cc5, 0x92, 0x00, 0x43, 0x8b, 0x72, 0x89, 0x0b, 0x6a);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedure2_32, 0x71ee5b20, 0xfb04, 0x11d1, 0xb3, 0xa8, 0x00, 0xa0, 0xc9, 0x11, 0xe8, 0xb2);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptParseProcedure2_64, 0xfe7c4271, 0x210c, 0x448d, 0x9f, 0x54, 0x76, 0xda, 0xb7, 0x04, 0x7b, 0x28);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSite, 0xdb01a1e3, 0xa42b, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSiteTraceInfo, 0x4b7272ae, 0x1955, 0x4bfe, 0x98, 0xb0, 0x78, 0x6, 0x21, 0x88, 0x85, 0x69);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSiteWindow, 0xd10f6761, 0x83e9, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSiteInterruptPoll, 0x539698a0, 0xcdca, 0x11cf, 0xa5, 0xeb, 0x00, 0xaa, 0x00, 0x47, 0xa0, 0x63);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSiteUIControl, 0xaedae97e, 0xd7ee, 0x4796, 0xb9, 0x60, 0x7f, 0x9, 0x2a, 0xe8, 0x44, 0xab);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptError, 0xeae1ba61, 0xa4ed, 0x11cf, 0x8f, 0x20, 0x00, 0x80, 0x5f, 0x2c, 0xd0, 0x64);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptError64, 0xb21fb2a1, 0x5b8f, 0x4963, 0x8c, 0x21, 0x21, 0x45, 0x0f, 0x84, 0xed, 0x7f);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IBindEventHandler, 0x63cdbcb0, 0xc1b1, 0x11d0, 0x93, 0x36, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptStats, 0xb8da6310, 0xe19b, 0x11d0, 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptProperty, 0x4954E0D0, 0xFBC7, 0x11D1, 0x84, 0x10, 0x00, 0x60, 0x08, 0xC3, 0xFB, 0xFC);")
|
||||
-cpp_quote("DEFINE_GUID(IID_ITridentEventSink, 0x1dc9ca50, 0x6ef, 0x11d2, 0x84, 0x15, 0x00, 0x60, 0x08, 0xc3, 0xfb, 0xfc);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptGarbageCollector, 0x6aa2c4a0, 0x2b53, 0x11d4, 0xa2, 0xa0, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptSIPInfo, 0x764651d0, 0x38de, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptTraceInfo, 0xC35456E7, 0xBEBF, 0x4a1b, 0x86, 0xA9, 0x24, 0xD5, 0x6B, 0xE8, 0xB3, 0x69);")
|
||||
cpp_quote("DEFINE_GUID(OID_VBSSIP, 0x1629f04e, 0x2799, 0x4db5, 0x8f, 0xe5, 0xac, 0xe1, 0x0f, 0x17, 0xeb, 0xab);")
|
||||
cpp_quote("DEFINE_GUID(OID_JSSIP, 0x6c9e010, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);")
|
||||
cpp_quote("DEFINE_GUID(OID_WSFSIP, 0x1a610570, 0x38ce, 0x11d4, 0xa2, 0xa3, 0x00, 0x10, 0x4b, 0xd3, 0x50, 0x90);")
|
||||
-cpp_quote("DEFINE_GUID(IID_IActiveScriptStringCompare, 0x58562769, 0xED52, 0x42f7, 0x84, 0x03, 0x49, 0x63, 0x51, 0x4E, 0x1F, 0x11);")
|
||||
cpp_quote("#endif")
|
||||
cpp_quote("")
|
||||
cpp_quote("#define SCRIPTITEM_ISVISIBLE 0x00000002")
|
||||
@ -1,53 +0,0 @@
|
||||
From 6249fb991dbffa36b8712250f71992c02bf5be33 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Wed, 8 Jul 2015 16:11:52 +0200
|
||||
Subject: extern C fixes in winstring.h and roapi.h.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/roapi.h b/mingw-w64-headers/include/roapi.h
|
||||
index 95c4fe6..9cd0f29 100644
|
||||
--- a/mingw-w64-headers/include/roapi.h
|
||||
+++ b/mingw-w64-headers/include/roapi.h
|
||||
@@ -24,7 +24,9 @@ typedef struct { } *RO_REGISTRATION_COOKIE;
|
||||
|
||||
typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **);
|
||||
|
||||
-/* */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
HRESULT WINAPI RoActivateInstance(HSTRING activatableClassId, IInspectable **instance);
|
||||
|
||||
@@ -50,6 +52,7 @@ HRESULT WINAPI RoUnregisterForApartmentShutdown (APARTMENT_SHUTDOWN_REGISTRATION
|
||||
HRESULT WINAPI RoGetApartmentIdentifier (UINT64 *apartmentId);
|
||||
|
||||
#ifdef __cplusplus
|
||||
+} /* extern "C" */
|
||||
|
||||
namespace Windows {
|
||||
namespace Foundation {
|
||||
diff --git a/mingw-w64-headers/include/winstring.h b/mingw-w64-headers/include/winstring.h
|
||||
index 908923e..76131d8 100644
|
||||
--- a/mingw-w64-headers/include/winstring.h
|
||||
+++ b/mingw-w64-headers/include/winstring.h
|
||||
@@ -33,10 +33,6 @@ unsigned long __RPC_USER HSTRING_UserSize64(unsigned long *pFlags, unsigned long
|
||||
unsigned char* __RPC_USER HSTRING_UserUnmarshal64(unsigned long *pFlags, unsigned char *pBuffer, HSTRING *ppidl);
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING string1, HSTRING string2, INT32 *result);
|
||||
|
||||
HRESULT WINAPI WindowsConcatString(HSTRING string1, HSTRING string2, HSTRING *newString);
|
||||
@@ -77,4 +73,8 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING string, HSTRING trimString, HSTRING
|
||||
|
||||
HRESULT WINAPI WindowsTrimStringStart(HSTRING string, HSTRING trimString, HSTRING *newString);
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
789
commit-7eee339
789
commit-7eee339
@ -1,789 +0,0 @@
|
||||
From 7eee3397ffe04d53ccde517e4cf9669f824969c8 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Wed, 29 Apr 2015 21:27:26 +0200
|
||||
Subject: msinkaut.idl: Added new file.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
|
||||
index 4fa8d83..3271692 100644
|
||||
--- a/mingw-w64-headers/Makefile.am
|
||||
+++ b/mingw-w64-headers/Makefile.am
|
||||
@@ -108,6 +108,7 @@ IDL_SRCS = \
|
||||
include/mmdeviceapi.idl \
|
||||
include/mscoree.idl \
|
||||
include/msctf.idl \
|
||||
+ include/msinkaut.idl \
|
||||
include/mshtml.idl \
|
||||
include/mshtmhst.idl \
|
||||
include/msopc.idl \
|
||||
diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in
|
||||
index 5a57f43..6c2c031 100644
|
||||
--- a/mingw-w64-headers/Makefile.in
|
||||
+++ b/mingw-w64-headers/Makefile.in
|
||||
@@ -332,6 +332,7 @@ EXTRA_HEADERS = \
|
||||
@HAVE_WIDL_TRUE@ include/mmdeviceapi.idl \
|
||||
@HAVE_WIDL_TRUE@ include/mscoree.idl \
|
||||
@HAVE_WIDL_TRUE@ include/msctf.idl \
|
||||
+@HAVE_WIDL_TRUE@ include/msinkaut.idl \
|
||||
@HAVE_WIDL_TRUE@ include/mshtml.idl \
|
||||
@HAVE_WIDL_TRUE@ include/mshtmhst.idl \
|
||||
@HAVE_WIDL_TRUE@ include/msopc.idl \
|
||||
diff --git a/mingw-w64-headers/include/msinkaut.idl b/mingw-w64-headers/include/msinkaut.idl
|
||||
new file mode 100644
|
||||
index 0000000..6d3c547
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/msinkaut.idl
|
||||
@@ -0,0 +1,711 @@
|
||||
+/**
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER within this package.
|
||||
+ */
|
||||
+
|
||||
+import "oaidl.idl";
|
||||
+import "ocidl.idl";
|
||||
+import "tpcshrd.idl";
|
||||
+
|
||||
+// cpp_quote("#import <tpcerror.h>")
|
||||
+
|
||||
+typedef enum InkRasterOperation {
|
||||
+ IRO_Black = 1,
|
||||
+ IRO_NotMergePen = 2,
|
||||
+ IRO_MaskNotPen = 3,
|
||||
+ IRO_NotCopyPen = 4,
|
||||
+ IRO_MaskPenNot = 5,
|
||||
+ IRO_Not = 6,
|
||||
+ IRO_XOrPen = 7,
|
||||
+ IRO_NotMaskPen = 8,
|
||||
+ IRO_MaskPen = 9,
|
||||
+ IRO_NotXOrPen = 10,
|
||||
+ IRO_NoOperation = 11,
|
||||
+ IRO_MergeNotPen = 12,
|
||||
+ IRO_CopyPen = 13,
|
||||
+ IRO_MergePenNot = 14,
|
||||
+ IRO_MergePen = 15,
|
||||
+ IRO_White = 16
|
||||
+} InkRasterOperation;
|
||||
+
|
||||
+typedef enum InkPenTip {
|
||||
+ IPT_Ball = 0,
|
||||
+ IPT_Rectangle = 1
|
||||
+} InkPenTip;
|
||||
+
|
||||
+typedef enum TabletHardwareCapabilities {
|
||||
+ THWC_Integrated = 0x1,
|
||||
+ THWC_CursorMustTouch = 0x2,
|
||||
+ THWC_HardProximity = 0x4,
|
||||
+ THWC_CursorsHavePhysicalIds = 0x8
|
||||
+} TabletHardwareCapabilities;
|
||||
+
|
||||
+typedef enum TabletPropertyMetricUnit {
|
||||
+ TPMU_Default,
|
||||
+ TPMU_Inches,
|
||||
+ TPMU_Centimeters,
|
||||
+ TPMU_Degrees,
|
||||
+ TPMU_Radians,
|
||||
+ TPMU_Seconds,
|
||||
+ TPMU_Pounds,
|
||||
+ TPMU_Grams
|
||||
+} TabletPropertyMetricUnit;
|
||||
+
|
||||
+typedef enum InkCursorButtonState {
|
||||
+ ICBS_Unavailable,
|
||||
+ ICBS_Up,
|
||||
+ ICBS_Down
|
||||
+} InkCursorButtonState;
|
||||
+
|
||||
+typedef enum InkRecognitionConfidence {
|
||||
+ IRC_Strong = 0,
|
||||
+ IRC_Intermediate = 1,
|
||||
+ IRC_Poor = 2
|
||||
+} InkRecognitionConfidence;
|
||||
+
|
||||
+typedef enum InkBoundingBoxMode {
|
||||
+ IBBM_Default = 0,
|
||||
+ IBBM_NoCurveFit = 1,
|
||||
+ IBBM_CurveFit = 2,
|
||||
+ IBBM_PointsOnly = 3,
|
||||
+ IBBM_Union = 4
|
||||
+} InkBoundingBoxMode;
|
||||
+
|
||||
+typedef enum InkExtractFlags {
|
||||
+ IEF_CopyFromOriginal = 0,
|
||||
+ IEF_RemoveFromOriginal = 1,
|
||||
+ IEF_Default = IEF_RemoveFromOriginal
|
||||
+} InkExtractFlags;
|
||||
+
|
||||
+typedef enum InkPersistenceFormat {
|
||||
+ IPF_InkSerializedFormat = 0,
|
||||
+ IPF_Base64InkSerializedFormat = 1,
|
||||
+ IPF_GIF = 2,
|
||||
+ IPF_Base64GIF = 3
|
||||
+} InkPersistenceFormat;
|
||||
+
|
||||
+typedef enum InkPersistenceCompressionMode {
|
||||
+ IPCM_Default = 0,
|
||||
+ IPCM_MaximumCompression = 1,
|
||||
+ IPCM_NoCompression = 2
|
||||
+} InkPersistenceCompressionMode;
|
||||
+
|
||||
+typedef enum InkClipboardFormats {
|
||||
+ ICF_None = 0x0000,
|
||||
+ ICF_InkSerializedFormat = 0x0001,
|
||||
+ ICF_SketchInk = 0x0002,
|
||||
+ ICF_TextInk = 0x0006,
|
||||
+ ICF_EnhancedMetafile = 0x0008,
|
||||
+ ICF_Metafile = 0x0020,
|
||||
+ ICF_Bitmap = 0x0040,
|
||||
+ ICF_PasteMask = 0x0007,
|
||||
+ ICF_CopyMask = 0x007f,
|
||||
+ ICF_Default = ICF_CopyMask
|
||||
+} InkClipboardFormats;
|
||||
+
|
||||
+typedef enum InkClipboardModes {
|
||||
+ ICB_Copy = 0x00,
|
||||
+ ICB_Cut = 0x01,
|
||||
+ ICB_ExtractOnly = 0x30,
|
||||
+ ICB_DelayedCopy = 0x20,
|
||||
+ ICB_Default = ICB_Copy
|
||||
+} InkClipboardModes;
|
||||
+
|
||||
+typedef enum InkCollectionMode {
|
||||
+ ICM_InkOnly,
|
||||
+ ICM_GestureOnly,
|
||||
+ ICM_InkAndGesture
|
||||
+} InkCollectionMode;
|
||||
+
|
||||
+typedef enum InkMousePointer {
|
||||
+ IMP_Default = 0,
|
||||
+ IMP_Arrow = 1,
|
||||
+ IMP_Crosshair = 2,
|
||||
+ IMP_Ibeam = 3,
|
||||
+ IMP_SizeNESW = 4,
|
||||
+ IMP_SizeNS = 5,
|
||||
+ IMP_SizeNWSE = 6,
|
||||
+ IMP_SizeWE = 7,
|
||||
+ IMP_UpArrow = 8,
|
||||
+ IMP_Hourglass = 9,
|
||||
+ IMP_NoDrop = 10,
|
||||
+ IMP_ArrowHourglass = 11,
|
||||
+ IMP_ArrowQuestion = 12,
|
||||
+ IMP_SizeAll = 13,
|
||||
+ IMP_Hand = 14,
|
||||
+ IMP_Custom = 99
|
||||
+} InkMousePointer;
|
||||
+
|
||||
+typedef enum InkApplicationGesture {
|
||||
+ IAG_AllGestures = 0x0000,
|
||||
+ IAG_NoGesture = 0xf000,
|
||||
+ IAG_Scratchout = 0xf001,
|
||||
+ IAG_Triangle = 0xf002,
|
||||
+ IAG_Square = 0xf003,
|
||||
+ IAG_Star = 0xf004,
|
||||
+ IAG_Check = 0xf005,
|
||||
+ IAG_Curlicue = 0xf010,
|
||||
+ IAG_DoubleCurlicue = 0xf011,
|
||||
+ IAG_Circle = 0xf020,
|
||||
+ IAG_DoubleCircle = 0xf021,
|
||||
+ IAG_SemiCircleLeft = 0xf028,
|
||||
+ IAG_SemiCircleRight = 0xf029,
|
||||
+ IAG_ChevronUp = 0xf030,
|
||||
+ IAG_ChevronDown = 0xf031,
|
||||
+ IAG_ChevronLeft = 0xf032,
|
||||
+ IAG_ChevronRight = 0xf033,
|
||||
+ IAG_ArrowUp = 0xf038,
|
||||
+ IAG_ArrowDown = 0xf039,
|
||||
+ IAG_ArrowLeft = 0xf03a,
|
||||
+ IAG_ArrowRight = 0xf03b,
|
||||
+ IAG_Up = 0xf058,
|
||||
+ IAG_Down = 0xf059,
|
||||
+ IAG_Left = 0xf05a,
|
||||
+ IAG_Right = 0xf05b,
|
||||
+ IAG_UpDown = 0xf060,
|
||||
+ IAG_DownUp = 0xf061,
|
||||
+ IAG_LeftRight = 0xf062,
|
||||
+ IAG_RightLeft = 0xf063,
|
||||
+ IAG_UpLeftLong = 0xf064,
|
||||
+ IAG_UpRightLong = 0xf065,
|
||||
+ IAG_DownLeftLong = 0xf066,
|
||||
+ IAG_DownRightLong = 0xf067,
|
||||
+ IAG_UpLeft = 0xf068,
|
||||
+ IAG_UpRight = 0xf069,
|
||||
+ IAG_DownLeft = 0xf06a,
|
||||
+ IAG_DownRight = 0xf06b,
|
||||
+ IAG_LeftUp = 0xf06c,
|
||||
+ IAG_LeftDown = 0xf06d,
|
||||
+ IAG_RightUp = 0xf06e,
|
||||
+ IAG_RightDown = 0xf06f,
|
||||
+ IAG_Exclamation = 0xf0a4,
|
||||
+ IAG_Tap = 0xf0f0,
|
||||
+ IAG_DoubleTap = 0xf0f1
|
||||
+} InkApplicationGesture;
|
||||
+
|
||||
+typedef enum InkCollectorEventInterest {
|
||||
+ ICEI_DefaultEvents = -1,
|
||||
+ ICEI_CursorDown = (ICEI_DefaultEvents+1),
|
||||
+ ICEI_Stroke = (ICEI_CursorDown+1),
|
||||
+ ICEI_NewPackets = (ICEI_Stroke+1),
|
||||
+ ICEI_NewInAirPackets = (ICEI_NewPackets+1),
|
||||
+ ICEI_CursorButtonDown = (ICEI_NewInAirPackets+1),
|
||||
+ ICEI_CursorButtonUp = (ICEI_CursorButtonDown+1),
|
||||
+ ICEI_CursorInRange = (ICEI_CursorButtonUp+1),
|
||||
+ ICEI_CursorOutOfRange = (ICEI_CursorInRange+1),
|
||||
+ ICEI_SystemGesture = (ICEI_CursorOutOfRange+1),
|
||||
+ ICEI_TabletAdded = (ICEI_SystemGesture+1),
|
||||
+ ICEI_TabletRemoved = (ICEI_TabletAdded+1),
|
||||
+ ICEI_MouseDown = (ICEI_TabletRemoved+1),
|
||||
+ ICEI_MouseMove = (ICEI_MouseDown+1),
|
||||
+ ICEI_MouseUp = (ICEI_MouseMove+1),
|
||||
+ ICEI_MouseWheel = (ICEI_MouseUp+1),
|
||||
+ ICEI_DblClick = (ICEI_MouseWheel+1),
|
||||
+ ICEI_AllEvents = (ICEI_DblClick+1)
|
||||
+} InkCollectorEventInterest;
|
||||
+
|
||||
+typedef enum DISPID_InkCollectorEvent {
|
||||
+ DISPID_ICEStroke = 1,
|
||||
+ DISPID_ICECursorDown = (DISPID_ICEStroke+1),
|
||||
+ DISPID_ICENewPackets = (DISPID_ICECursorDown+1),
|
||||
+ DISPID_ICENewInAirPackets = (DISPID_ICENewPackets+1),
|
||||
+ DISPID_ICECursorButtonDown = (DISPID_ICENewInAirPackets+1),
|
||||
+ DISPID_ICECursorButtonUp = (DISPID_ICECursorButtonDown+1),
|
||||
+ DISPID_ICECursorInRange = (DISPID_ICECursorButtonUp+1),
|
||||
+ DISPID_ICECursorOutOfRange = (DISPID_ICECursorInRange+1),
|
||||
+ DISPID_ICESystemGesture = (DISPID_ICECursorOutOfRange+1),
|
||||
+ DISPID_ICEGesture = (DISPID_ICESystemGesture+1),
|
||||
+ DISPID_ICETabletAdded = (DISPID_ICEGesture+1),
|
||||
+ DISPID_ICETabletRemoved = (DISPID_ICETabletAdded+1),
|
||||
+ DISPID_IOEPainting = (DISPID_ICETabletRemoved+1),
|
||||
+ DISPID_IOEPainted = (DISPID_IOEPainting+1),
|
||||
+ DISPID_IOESelectionChanging = (DISPID_IOEPainted+1),
|
||||
+ DISPID_IOESelectionChanged = (DISPID_IOESelectionChanging+1),
|
||||
+ DISPID_IOESelectionMoving = (DISPID_IOESelectionChanged+1),
|
||||
+ DISPID_IOESelectionMoved = (DISPID_IOESelectionMoving+1),
|
||||
+ DISPID_IOESelectionResizing = (DISPID_IOESelectionMoved+1),
|
||||
+ DISPID_IOESelectionResized = (DISPID_IOESelectionResizing+1),
|
||||
+ DISPID_IOEStrokesDeleting = (DISPID_IOESelectionResized+1),
|
||||
+ DISPID_IOEStrokesDeleted = (DISPID_IOEStrokesDeleting+1),
|
||||
+ DISPID_IPEChangeUICues = (DISPID_IOEStrokesDeleted+1),
|
||||
+ DISPID_IPEClick = (DISPID_IPEChangeUICues+1),
|
||||
+ DISPID_IPEDblClick = (DISPID_IPEClick+1),
|
||||
+ DISPID_IPEInvalidated = (DISPID_IPEDblClick+1),
|
||||
+ DISPID_IPEMouseDown = (DISPID_IPEInvalidated+1),
|
||||
+ DISPID_IPEMouseEnter = (DISPID_IPEMouseDown+1),
|
||||
+ DISPID_IPEMouseHover = (DISPID_IPEMouseEnter+1),
|
||||
+ DISPID_IPEMouseLeave = (DISPID_IPEMouseHover+1),
|
||||
+ DISPID_IPEMouseMove = (DISPID_IPEMouseLeave+1),
|
||||
+ DISPID_IPEMouseUp = (DISPID_IPEMouseMove+1),
|
||||
+ DISPID_IPEMouseWheel = (DISPID_IPEMouseUp+1),
|
||||
+ DISPID_IPESizeModeChanged = (DISPID_IPEMouseWheel+1),
|
||||
+ DISPID_IPEStyleChanged = (DISPID_IPESizeModeChanged+1),
|
||||
+ DISPID_IPESystemColorsChanged = (DISPID_IPEStyleChanged+1),
|
||||
+ DISPID_IPEKeyDown = (DISPID_IPESystemColorsChanged+1),
|
||||
+ DISPID_IPEKeyPress = (DISPID_IPEKeyDown+1),
|
||||
+ DISPID_IPEKeyUp = (DISPID_IPEKeyPress+1),
|
||||
+ DISPID_IPEResize = (DISPID_IPEKeyUp+1),
|
||||
+ DISPID_IPESizeChanged = (DISPID_IPEResize+1)
|
||||
+} DISPID_InkCollectorEvent;
|
||||
+
|
||||
+
|
||||
+interface IInkDisp;
|
||||
+interface IInkStrokes;
|
||||
+interface IInkRecognitionAlternate;
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(db489209-b7c3-411d-90f6-1548cfff271e),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkExtendedProperty : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Guid([out, retval] BSTR *Guid);
|
||||
+ [propget] HRESULT Data([out, retval] VARIANT *Data);
|
||||
+ [propput] HRESULT Data([in] VARIANT Data);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(89f2a8be-95a9-4530-8b8f-88e971e3e25f),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkExtendedProperties : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ HRESULT Item([in] VARIANT Identifier, [out, retval] IInkExtendedProperty **Item);
|
||||
+ HRESULT Add([in] BSTR Guid, [in] VARIANT Data, [out, retval] IInkExtendedProperty **InkExtendedProperty);
|
||||
+ HRESULT Remove([in] VARIANT Identifier);
|
||||
+ HRESULT Clear();
|
||||
+ HRESULT DoesPropertyExist([in] BSTR Guid, [out, retval] VARIANT_BOOL *DoesPropertyExist);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(bf519b75-0a15-4623-adc9-c00d436a8092),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkDrawingAttributes : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Color([out] long *CurrentColor);
|
||||
+ [propput] HRESULT Color([in] long NewColor);
|
||||
+ [propget] HRESULT Width([out, retval] float *CurrentWidth);
|
||||
+ [propput] HRESULT Width([in] float NewWidth);
|
||||
+ [propget] HRESULT Height([out, retval] float *CurrentHeight);
|
||||
+ [propput] HRESULT Height([in] float NewHeight);
|
||||
+ [propget] HRESULT FitToCurve([out, retval] VARIANT_BOOL *Flag);
|
||||
+ [propput] HRESULT FitToCurve([in] VARIANT_BOOL Flag);
|
||||
+ [propget] HRESULT IgnorePressure([out, retval] VARIANT_BOOL *Flag);
|
||||
+ [propput] HRESULT IgnorePressure([in] VARIANT_BOOL Flag);
|
||||
+ [propget] HRESULT AntiAliased([out, retval] VARIANT_BOOL *Flag);
|
||||
+ [propput] HRESULT AntiAliased([in] VARIANT_BOOL Flag);
|
||||
+ [propget] HRESULT Transparency([out, retval] long *CurrentTransparency);
|
||||
+ [propput] HRESULT Transparency([in] long NewTransparency);
|
||||
+ [propget] HRESULT RasterOperation([out, retval] InkRasterOperation *CurrentRasterOperation);
|
||||
+ [propput] HRESULT RasterOperation([in] InkRasterOperation NewRasterOperation);
|
||||
+ [propget] HRESULT PenTip([out, retval] InkPenTip *CurrentPenTip);
|
||||
+ [propput] HRESULT PenTip([in] InkPenTip NewPenTip);
|
||||
+ [propget] HRESULT ExtendedProperties([out, retval] IInkExtendedProperties **Properties);
|
||||
+ HRESULT Clone([out, retval] IInkDrawingAttributes **DrawingAttributes);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(9794ff82-6071-4717-8a8b-6ac7c64a686e),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkRectangle : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Top([out, retval] long *Units);
|
||||
+ [propput] HRESULT Top([in] long Units);
|
||||
+ [propget] HRESULT Left([out, retval] long *Units);
|
||||
+ [propput] HRESULT Left([in] long Units);
|
||||
+ [propget] HRESULT Bottom([out, retval] long *Units);
|
||||
+ [propput] HRESULT Bottom([in] long Units);
|
||||
+ [propget] HRESULT Right([out, retval] long *Units);
|
||||
+ [propput] HRESULT Right([in] long Units);
|
||||
+ [propget] HRESULT Data([out, retval] RECT *Rect);
|
||||
+ [propput] HRESULT Data([in] RECT Rect);
|
||||
+ HRESULT GetRectangle([out] long *Top, [out] long *Left, [out] long *Bottom, [out] long *Right);
|
||||
+ HRESULT SetRectangle([in] long Top, [in] long Left, [in] long Bottom, [in] long Right);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(2de25eaa-6ef8-42d5-aee9-185bc81b912d),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkTablet : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Name([out, retval] BSTR *Name);
|
||||
+ [propget] HRESULT PlugAndPlayId([out, retval] BSTR *Id);
|
||||
+ [propget] HRESULT MaximumInputRectangle([out, retval] IInkRectangle **Rectangle);
|
||||
+ [propget] HRESULT HardwareCapabilities([out, retval] TabletHardwareCapabilities *Capabilities);
|
||||
+ HRESULT IsPacketPropertySupported([in] BSTR packetPropertyName, [out, retval] VARIANT_BOOL *Supported);
|
||||
+ HRESULT GetPropertyMetrics([in] BSTR propertyName, [out] long *Minimum, [out] long *Maximum,
|
||||
+ [out] TabletPropertyMetricUnit *Units, [out] float *Resolution);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(85ef9417-1d59-49b2-a13c-702c85430894),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCursorButton : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Name([out, retval] BSTR *Name);
|
||||
+ [propget] HRESULT Id([out, retval] BSTR *Id);
|
||||
+ [propget] HRESULT State([out, retval] InkCursorButtonState *CurrentState);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(3671cC40-b624-4671-9fa0-db119d952d54),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCursorButtons : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ HRESULT Item([in] VARIANT Identifier, [out, retval] IInkCursorButton **Button);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(ad30c630-40c5-4350-8405-9c71012fc558),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCursor : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Name([out, retval] BSTR *Name);
|
||||
+ [propget] HRESULT Id([out, retval] long *Id);
|
||||
+ [propget] HRESULT Inverted([out, retval] VARIANT_BOOL *Status);
|
||||
+ [propget] HRESULT DrawingAttributes([out, retval] IInkDrawingAttributes **Attributes);
|
||||
+ [propputref] HRESULT DrawingAttributes([in] IInkDrawingAttributes *Attributes);
|
||||
+ [propget] HRESULT Tablet([out, retval] IInkTablet **Tablet);
|
||||
+ [propget] HRESULT Buttons([out, retval] IInkCursorButtons **Buttons);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(615f1d43-8703-4565-88e2-8201d2ecd7b7),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkTransform : IDispatch
|
||||
+{
|
||||
+ HRESULT Reset();
|
||||
+ HRESULT Translate([in] float HorizontalComponent, [in] float VerticalComponent);
|
||||
+ HRESULT Rotate([in] float Degrees, [in, defaultvalue(0)] float x, [in, defaultvalue(0)] float y);
|
||||
+ HRESULT Reflect([in] VARIANT_BOOL Horizontally, [in] VARIANT_BOOL Vertically);
|
||||
+ HRESULT Shear([in] float HorizontalComponent, [in] float VerticalComponent);
|
||||
+ HRESULT ScaleTransform([in] float HorizontalMultiplier, [in] float VerticalMultiplier);
|
||||
+ HRESULT GetTransform([out] float *eM11, [out] float *eM12, [out] float *eM21, [out] float *eM22,
|
||||
+ [out] float *eDx, [out] float *eDy);
|
||||
+ HRESULT SetTransform([in] float eM11, [in] float eM12, [in] float eM21, [in] float eM22, [in] float eDx, [in] float eDy);
|
||||
+ [propget, hidden] HRESULT eM11([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eM11([in] float Value);
|
||||
+ [propget, hidden] HRESULT eM12([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eM12([in] float Value);
|
||||
+ [propget, hidden] HRESULT eM21([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eM21([in] float Value);
|
||||
+ [propget, hidden] HRESULT eM22([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eM22([in] float Value);
|
||||
+ [propget, hidden] HRESULT eDx([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eDx([in] float Value);
|
||||
+ [propget, hidden] HRESULT eDy([out, retval] float *Value);
|
||||
+ [propput, hidden] HRESULT eDy([in] float Value);
|
||||
+ [propget, hidden] HRESULT Data([out, retval] XFORM *XForm);
|
||||
+ [propput, hidden] HRESULT Data([in] XFORM XForm);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(286a167f-9f19-4c61-9d53-4f07be622b84),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkRecognitionAlternates : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget, restricted] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ [propget] HRESULT Strokes([out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT Item([in] long Index, [out, retval] IInkRecognitionAlternate **InkRecoAlternate);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(b7e660ad-77e4-429b-adda-873780d1fc4a),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkRecognitionAlternate : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT String([out, retval] BSTR *RecoString);
|
||||
+ [propget] HRESULT Confidence([out, retval] InkRecognitionConfidence *Confidence) ;
|
||||
+ [propget] HRESULT Baseline([out, retval] VARIANT *Baseline);
|
||||
+ [propget] HRESULT Midline([out, retval] VARIANT *Midline);
|
||||
+ [propget] HRESULT Ascender([out, retval] VARIANT *Ascender);
|
||||
+ [propget] HRESULT Descender([out, retval] VARIANT *Descender);
|
||||
+ [propget] HRESULT LineNumber([out, retval] long *LineNumber);
|
||||
+ [propget] HRESULT Strokes([out, retval] IInkStrokes **Strokes);
|
||||
+ [propget] HRESULT LineAlternates([out, retval] IInkRecognitionAlternates **LineAlternates);
|
||||
+ [propget] HRESULT ConfidenceAlternates([out, retval] IInkRecognitionAlternates **ConfidenceAlternates);
|
||||
+ HRESULT GetStrokesFromStrokeRanges([in] IInkStrokes *Strokes, [out, retval] IInkStrokes **GetStrokesFromStrokeRanges);
|
||||
+ HRESULT GetStrokesFromTextRange([in, out] long *selectionStart, [in, out] long *selectionLength,
|
||||
+ [out, retval] IInkStrokes **GetStrokesFromTextRange);
|
||||
+ HRESULT GetTextRangeFromStrokes([in] IInkStrokes *Strokes, [in, out] long *selectionStart, [in, out] long *selectionLength);
|
||||
+ HRESULT AlternatesWithConstantPropertyValues([in] BSTR PropertyType,
|
||||
+ [out, retval] IInkRecognitionAlternates **AlternatesWithConstantPropertyValues);
|
||||
+ HRESULT GetPropertyValue([in] BSTR PropertyType, [out, retval] VARIANT *PropertyValue);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(3bc129a8-86cd-45ad-bde8-e0d32d61c16d),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkRecognitionResult : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT TopString([out, retval] BSTR *TopString);
|
||||
+ [propget] HRESULT TopAlternate([out, retval] IInkRecognitionAlternate **TopAlternate);
|
||||
+ [propget] HRESULT TopConfidence([out, retval] InkRecognitionConfidence *TopConfidence);
|
||||
+ [propget] HRESULT Strokes([out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT AlternatesFromSelection([in] long selectionStart, [in] long selectionLength, [in] long maximumAlternates,
|
||||
+ [out, retval] IInkRecognitionAlternates **AlternatesFromSelection);
|
||||
+ HRESULT ModifyTopAlternate([in] IInkRecognitionAlternate *Alternate);
|
||||
+ HRESULT SetResultOnStrokes();
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(43242fea-91d1-4a72-963e-fbb91829cfa2),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkStrokeDisp : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT ID([out, retval] long *ID);
|
||||
+ [propget] HRESULT BezierPoints([out, retval] VARIANT *Points);
|
||||
+ [propget] HRESULT DrawingAttributes([out, retval] IInkDrawingAttributes **DrawAttrs);
|
||||
+ [propputref] HRESULT DrawingAttributes([in] IInkDrawingAttributes *DrawAttrs);
|
||||
+ [propget] HRESULT Ink([out, retval] IInkDisp **Ink);
|
||||
+ [propget] HRESULT ExtendedProperties([out, retval] IInkExtendedProperties **Properties);
|
||||
+ [propget] HRESULT PolylineCusps([out, retval] VARIANT *Cusps);
|
||||
+ [propget] HRESULT BezierCusps([out, retval] VARIANT *Cusps);
|
||||
+ [propget] HRESULT SelfIntersections([out, retval] VARIANT *Intersections);
|
||||
+ [propget] HRESULT PacketCount([out, retval] long *plCount);
|
||||
+ [propget] HRESULT PacketSize([out, retval] long *plSize);
|
||||
+ [propget] HRESULT PacketDescription([out, retval] VARIANT *PacketDescription);
|
||||
+ [propget] HRESULT Deleted([out, retval] VARIANT_BOOL *Deleted);
|
||||
+ HRESULT GetBoundingBox([in] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle **Rectangle);
|
||||
+ HRESULT FindIntersections([in] IInkStrokes *Strokes, [out, retval] VARIANT *Intersections);
|
||||
+ HRESULT GetRectangleIntersections([in] IInkRectangle *Rectangle, [out, retval] VARIANT *Intersections);
|
||||
+ HRESULT Clip([in] IInkRectangle *Rectangle);
|
||||
+ HRESULT HitTestCircle([in] long X, [in] long Y, [in] float Radius, [out, retval] VARIANT_BOOL *Intersects);
|
||||
+ HRESULT NearestPoint([in] long X, [in] long Y, [in, out] float *Distance, [out, retval] float *Point);
|
||||
+ HRESULT Split([in] float SplitAt, [out, retval] IInkStrokeDisp **NewStroke);
|
||||
+ HRESULT GetPacketDescriptionPropertyMetrics([in] BSTR PropertyName, [out] long *Minimum, [out] long *Maximum,
|
||||
+ [out] TabletPropertyMetricUnit *Units, [out] float *Resolution);
|
||||
+ HRESULT GetPoints([in] long Index, [in] long Count, [out, retval] VARIANT *Points);
|
||||
+ HRESULT SetPoints([in] VARIANT Points, [in] long Index, [in] long Count, [out, retval] long *NumberOfPointsSet);
|
||||
+ HRESULT GetPacketData([in] long Index, [in] long Count, [out, retval] VARIANT *PacketData);
|
||||
+ HRESULT GetPacketValuesByProperty([in] BSTR PropertyName, [in] long Index, [in] long Count,
|
||||
+ [out, retval] VARIANT *PacketValues) ;
|
||||
+ HRESULT SetPacketValuesByProperty([in] BSTR bstrPropertyName, [in] VARIANT PacketValues, [in] long Index,
|
||||
+ [in] long Count, [out, retval] long *NumberOfPacketsSet);
|
||||
+ HRESULT GetFlattenedBezierPoints([in] long FittingError, [out, retval] VARIANT *FlattenedBezierPoints);
|
||||
+ HRESULT Transform([in] IInkTransform *Transform, [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth);
|
||||
+ HRESULT ScaleToRectangle([in] IInkRectangle *Rectangle);
|
||||
+ HRESULT Move([in] float HorizontalComponent, [in] float VerticalComponent);
|
||||
+ HRESULT Rotate([in] float Degrees, [in, defaultvalue(0)] float x, [in, defaultvalue(0)] float y);
|
||||
+ HRESULT Shear([in] float HorizontalMultiplier, [in] float VerticalMultiplier);
|
||||
+ HRESULT ScaleTransform([in] float HorizontalMultiplier, [in] float VerticalMultiplier);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(7e23a88f-c30e-420f-9bdb-28902543f0c1),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCustomStrokes : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget, restricted] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ HRESULT Item([in] VARIANT Identifier, [out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT Add([in] BSTR Name, [in] IInkStrokes *Strokes);
|
||||
+ HRESULT Remove([in] VARIANT Identifier);
|
||||
+ HRESULT Clear();
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(9d398fa0-c4e2-4fcd-9973-975caaf47ea6),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkDisp : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Strokes([out, retval] IInkStrokes **Strokes);
|
||||
+ [propget] HRESULT ExtendedProperties([out, retval] IInkExtendedProperties **Properties);
|
||||
+ [propget] HRESULT Dirty([out, retval] VARIANT_BOOL *Dirty);
|
||||
+ [propput] HRESULT Dirty([in] VARIANT_BOOL Dirty);
|
||||
+ [propget] HRESULT CustomStrokes([out, retval] IInkCustomStrokes **ppunkInkCustomStrokes);
|
||||
+ HRESULT GetBoundingBox([in] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle **Rectangle);
|
||||
+ HRESULT DeleteStrokes([in, unique, defaultvalue(0)] IInkStrokes *Strokes);
|
||||
+ HRESULT DeleteStroke([in] IInkStrokeDisp *Stroke);
|
||||
+ HRESULT ExtractStrokes([in] IInkStrokes *Strokes, InkExtractFlags ExtractFlags, [out, retval] IInkDisp **ExtractedInk);
|
||||
+ HRESULT ExtractWithRectangle([in] IInkRectangle *Rectangle, [in] InkExtractFlags extractFlags,
|
||||
+ [out, retval] IInkDisp **ExtractedInk);
|
||||
+ HRESULT Clip([in] IInkRectangle *Rectangle);
|
||||
+ HRESULT Clone([out, retval] IInkDisp **NewInk);
|
||||
+ HRESULT HitTestCircle([in] long X, [in] long Y, [in] float radius, [out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT HitTestWithRectangle([in] IInkRectangle *SelectionRectangle, [in] float IntersectPercent,
|
||||
+ [out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT HitTestWithLasso([in] VARIANT Points, [in] float IntersectPercent, [in, out, unique] VARIANT *LassoPoints,
|
||||
+ [out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT NearestPoint([in] long X, [in] long Y, [in, out] float *PointOnStroke, [in, out] float *DistanceFromPacket,
|
||||
+ [out, retval] IInkStrokeDisp **Stroke);
|
||||
+ HRESULT CreateStrokes([in] VARIANT StrokeIds, [out, retval] IInkStrokes **Strokes);
|
||||
+ HRESULT AddStrokesAtRectangle([in] IInkStrokes *SourceStrokes, [in] IInkRectangle *TargetRectangle);
|
||||
+ HRESULT Save([in] InkPersistenceFormat PersistenceFormat, [in] InkPersistenceCompressionMode CompressionMode,
|
||||
+ [out, retval] VARIANT *Data);
|
||||
+ HRESULT Load([in] VARIANT Data);
|
||||
+ HRESULT CreateStroke([in] VARIANT PacketData, [in] VARIANT PacketDescription, [out, retval] IInkStrokeDisp **Stroke);
|
||||
+ HRESULT ClipboardCopyWithRectangle([in] IInkRectangle *Rectangle, [in] InkClipboardFormats ClipboardFormats,
|
||||
+ [in] InkClipboardModes ClipboardModes, [out, retval] IDataObject **DataObject);
|
||||
+ HRESULT ClipboardCopy([in] IInkStrokes *strokes, [in] InkClipboardFormats ClipboardFormats,
|
||||
+ [in] InkClipboardModes ClipboardModes, [out, retval] IDataObject **DataObject);
|
||||
+ HRESULT CanPaste([in] IDataObject *DataObject, [out, retval] VARIANT_BOOL *CanPaste);
|
||||
+ HRESULT ClipboardPaste([in] long x, [in] long y, [in, unique] IDataObject *DataObject, [out, retval] IInkStrokes **Strokes);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(f1f4c9d8-590a-4963-b3ae-1935671bb6f3),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkStrokes : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ [propget] HRESULT Ink([out, retval] IInkDisp **Ink);
|
||||
+ [propget] HRESULT RecognitionResult([out, retval] IInkRecognitionResult **RecognitionResult);
|
||||
+ HRESULT ToString([out, retval] BSTR *ToString);
|
||||
+ HRESULT Item([in] long Index, [out, retval] IInkStrokeDisp **Stroke);
|
||||
+ HRESULT Add([in] IInkStrokeDisp *InkStroke);
|
||||
+ HRESULT AddStrokes([in] IInkStrokes *InkStrokes);
|
||||
+ HRESULT Remove([in] IInkStrokeDisp *InkStroke);
|
||||
+ HRESULT RemoveStrokes([in] IInkStrokes *InkStrokes);
|
||||
+ HRESULT ModifyDrawingAttributes([in] IInkDrawingAttributes *DrawAttrs);
|
||||
+ HRESULT GetBoundingBox([in] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle **BoundingBox);
|
||||
+ HRESULT Transform([in] IInkTransform *Transform, [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth);
|
||||
+ HRESULT ScaleToRectangle([in] IInkRectangle *Rectangle);
|
||||
+ HRESULT Move([in] float HorizontalComponent, [in] float VerticalComponent);
|
||||
+ HRESULT Rotate([in] float Degrees, [in, defaultvalue(0)] float x, [in, defaultvalue(0)] float y);
|
||||
+ HRESULT Shear([in] float HorizontalMultiplier, [in] float VerticalMultiplier);
|
||||
+ HRESULT ScaleTransform([in] float HorizontalMultiplier, [in] float VerticalMultiplier);
|
||||
+ HRESULT Clip([in] IInkRectangle *Rectangle);
|
||||
+ HRESULT RemoveRecognitionResult();
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(e6257a9c-b511-4f4c-a8b0-a7dbc9506b83),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkRenderer : IDispatch
|
||||
+{
|
||||
+ HRESULT GetViewTransform([in] IInkTransform *ViewTransform) ;
|
||||
+ HRESULT SetViewTransform([in] IInkTransform *ViewTransform);
|
||||
+ HRESULT GetObjectTransform([in] IInkTransform *ObjectTransform);
|
||||
+ HRESULT SetObjectTransform([in] IInkTransform *ObjectTransform);
|
||||
+ HRESULT Draw([in] LONG_PTR hDC, [in] IInkStrokes *Strokes);
|
||||
+ HRESULT DrawStroke([in] LONG_PTR hDC, [in] IInkStrokeDisp *Stroke,
|
||||
+ [in, defaultvalue(0)] IInkDrawingAttributes *DrawingAttributes);
|
||||
+ HRESULT PixelToInkSpace([in] LONG_PTR hDC, [in, out] long *x, [in, out] long *y);
|
||||
+ HRESULT InkSpaceToPixel([in] LONG_PTR hdcDisplay, [in, out] long *x, [in, out] long *y);
|
||||
+ HRESULT PixelToInkSpaceFromPoints([in] LONG_PTR hDC, [in, out] VARIANT *Points);
|
||||
+ HRESULT InkSpaceToPixelFromPoints([in] LONG_PTR hDC, [in, out] VARIANT *Points);
|
||||
+ HRESULT Measure([in] IInkStrokes *Strokes, [out, retval] IInkRectangle **Rectangle);
|
||||
+ HRESULT MeasureStroke([in] IInkStrokeDisp *Stroke, [in] IInkDrawingAttributes *DrawingAttributes,
|
||||
+ [out, retval] IInkRectangle **Rectangle);
|
||||
+ HRESULT Move([in] float HorizontalComponent, [in] float VerticalComponent);
|
||||
+ HRESULT Rotate([in] float Degrees, [in, defaultvalue(0)] float x, [in, defaultvalue(0)] float y);
|
||||
+ HRESULT ScaleTransform([in] float HorizontalMultiplier, [in] float VerticalMultiplier,
|
||||
+ [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(a248c1ac-c698-4e06-9e5c-d57f77c7e647),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCursors : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT Count([out, retval] long *Count);
|
||||
+ [propget, restricted] HRESULT _NewEnum([out, retval] IUnknown **_NewEnum);
|
||||
+ HRESULT Item([in] long Index, [out, retval] IInkCursor **Cursor);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(f0f060b5-8b1f-4a7c-89ec-880692588a4f),
|
||||
+ dual
|
||||
+]
|
||||
+interface IInkCollector : IDispatch
|
||||
+{
|
||||
+ [propget] HRESULT hWnd([out, retval] LONG_PTR *CurrentWindow);
|
||||
+ [propput] HRESULT hWnd([in] LONG_PTR NewWindow);
|
||||
+ [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *Collecting);
|
||||
+ [propput] HRESULT Enabled([in] VARIANT_BOOL Collecting);
|
||||
+ [propget] HRESULT DefaultDrawingAttributes([out, retval] IInkDrawingAttributes **CurrentAttributes);
|
||||
+ [propputref] HRESULT DefaultDrawingAttributes([in] IInkDrawingAttributes *NewAttributes);
|
||||
+ [propget] HRESULT Renderer([out, retval] IInkRenderer **CurrentInkRenderer);
|
||||
+ [propputref] HRESULT Renderer([in] IInkRenderer *NewInkRenderer);
|
||||
+ [propget] HRESULT Ink([out, retval] IInkDisp **Ink);
|
||||
+ [propputref] HRESULT Ink([in] IInkDisp *NewInk);
|
||||
+ [propget] HRESULT AutoRedraw([out, retval] VARIANT_BOOL *AutoRedraw);
|
||||
+ [propput] HRESULT AutoRedraw([in] VARIANT_BOOL AutoRedraw);
|
||||
+ [propget] HRESULT CollectingInk([out, retval] VARIANT_BOOL *Collecting);
|
||||
+ [propget] HRESULT CollectionMode([out, retval] InkCollectionMode *Mode);
|
||||
+ [propput] HRESULT CollectionMode([in] InkCollectionMode Mode);
|
||||
+ [propget] HRESULT DynamicRendering([out, retval] VARIANT_BOOL *Enabled);
|
||||
+ [propput] HRESULT DynamicRendering([in] VARIANT_BOOL Enabled);
|
||||
+ [propget] HRESULT DesiredPacketDescription([out, retval] VARIANT *PacketGuids);
|
||||
+ [propput] HRESULT DesiredPacketDescription([in] VARIANT PacketGuids);
|
||||
+ [propget] HRESULT MouseIcon([out, retval] IPictureDisp **MouseIcon);
|
||||
+ [propput] HRESULT MouseIcon([in, unique] IPictureDisp *MouseIcon);
|
||||
+ [propputref] HRESULT MouseIcon([in, unique] IPictureDisp *MouseIcon);
|
||||
+ [propget] HRESULT MousePointer([out, retval] InkMousePointer *MousePointer);
|
||||
+ [propput] HRESULT MousePointer([in] InkMousePointer MousePointer);
|
||||
+ [propget] HRESULT Cursors([out, retval] IInkCursors **Cursors);
|
||||
+ [propget] HRESULT MarginX([out, retval] long *MarginX);
|
||||
+ [propput] HRESULT MarginX([in] long MarginX);
|
||||
+ [propget] HRESULT MarginY([out, retval] long *MarginY);
|
||||
+ [propput] HRESULT MarginY([in] long MarginY);
|
||||
+ [propget] HRESULT Tablet([out, retval] IInkTablet **SingleTablet);
|
||||
+ [propget] HRESULT SupportHighContrastInk([out, retval] VARIANT_BOOL *Support);
|
||||
+ [propput] HRESULT SupportHighContrastInk([in] VARIANT_BOOL Support);
|
||||
+ HRESULT SetGestureStatus([in] InkApplicationGesture Gesture, [in] VARIANT_BOOL Listen);
|
||||
+ HRESULT GetGestureStatus([in] InkApplicationGesture Gesture, [out, retval] VARIANT_BOOL *Listening);
|
||||
+ HRESULT GetWindowInputRectangle([in, out] IInkRectangle **WindowInputRectangle);
|
||||
+ HRESULT SetWindowInputRectangle([in] IInkRectangle *WindowInputRectangle);
|
||||
+ HRESULT SetAllTabletsMode([in, defaultvalue(-1)] VARIANT_BOOL UseMouseForInput);
|
||||
+ HRESULT SetSingleTabletIntegratedMode([in] IInkTablet *Tablet);
|
||||
+ HRESULT GetEventInterest([in] InkCollectorEventInterest EventId, [out, retval] VARIANT_BOOL *Listen);
|
||||
+ HRESULT SetEventInterest([in] InkCollectorEventInterest EventId, [in] VARIANT_BOOL Listen);
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ uuid(11a583f2-712d-4fea-abcf-ab4af38ea06b)
|
||||
+]
|
||||
+dispinterface _IInkCollectorEvents
|
||||
+{
|
||||
+ properties:
|
||||
+ methods:
|
||||
+ /* FIXME */
|
||||
+}
|
||||
+
|
||||
+[
|
||||
+ uuid(43fb1553-ad74-4ee8-88e4-3e6daac915db)
|
||||
+]
|
||||
+coclass InkCollector
|
||||
+{
|
||||
+}
|
||||
diff --git a/mingw-w64-headers/include/tpcshrd.h b/mingw-w64-headers/include/tpcshrd.h
|
||||
index a8dd1fc..b114270 100644
|
||||
--- a/mingw-w64-headers/include/tpcshrd.h
|
||||
+++ b/mingw-w64-headers/include/tpcshrd.h
|
||||
@@ -44,6 +44,17 @@ extern "C" {
|
||||
typedef DWORD CURSOR_ID;
|
||||
typedef USHORT SYSTEM_EVENT;
|
||||
typedef DWORD TABLET_CONTEXT_ID;
|
||||
+#ifndef _XFORM_
|
||||
+#define _XFORM_
|
||||
+typedef struct tagXFORM {
|
||||
+ float eM11;
|
||||
+ float eM12;
|
||||
+ float eM21;
|
||||
+ float eM22;
|
||||
+ float eDx;
|
||||
+ float eDy;
|
||||
+} XFORM;
|
||||
+#endif
|
||||
/* Begin additional prototypes for all interfaces */
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/tpcshrd.idl b/mingw-w64-headers/include/tpcshrd.idl
|
||||
index cc74801..d11f3e8 100644
|
||||
--- a/mingw-w64-headers/include/tpcshrd.idl
|
||||
+++ b/mingw-w64-headers/include/tpcshrd.idl
|
||||
@@ -28,3 +28,15 @@ cpp_quote("#define IP_MARGIN 0x4")
|
||||
typedef DWORD CURSOR_ID;
|
||||
typedef USHORT SYSTEM_EVENT;
|
||||
typedef DWORD TABLET_CONTEXT_ID;
|
||||
+
|
||||
+cpp_quote("#ifndef _XFORM_")
|
||||
+cpp_quote("#define _XFORM_")
|
||||
+typedef struct tagXFORM {
|
||||
+ float eM11;
|
||||
+ float eM12;
|
||||
+ float eM21;
|
||||
+ float eM22;
|
||||
+ float eDx;
|
||||
+ float eDy;
|
||||
+} XFORM;
|
||||
+cpp_quote("#endif")
|
||||
@ -1,35 +0,0 @@
|
||||
From 85b403445b2308fa6277aa26446da790866fe052 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Fri, 17 Apr 2015 16:42:32 +0200
|
||||
Subject: textstor.idl: Updated to current Wine version.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/textstor.h b/mingw-w64-headers/include/textstor.h
|
||||
index 7581c39..0e051d7 100644
|
||||
--- a/mingw-w64-headers/include/textstor.h
|
||||
+++ b/mingw-w64-headers/include/textstor.h
|
||||
@@ -91,6 +91,10 @@ extern "C" {
|
||||
|
||||
#define TS_ST_CORRECTION (0x1)
|
||||
|
||||
+#define GXFPF_ROUND_NEAREST (0x1)
|
||||
+
|
||||
+#define GXFPF_NEAREST (0x2)
|
||||
+
|
||||
typedef enum __WIDL_textstor_generated_name_00000002 {
|
||||
TS_AE_NONE = 0,
|
||||
TS_AE_START = 1,
|
||||
diff --git a/mingw-w64-headers/include/textstor.idl b/mingw-w64-headers/include/textstor.idl
|
||||
index 5492071..7640e8c 100644
|
||||
--- a/mingw-w64-headers/include/textstor.idl
|
||||
+++ b/mingw-w64-headers/include/textstor.idl
|
||||
@@ -74,6 +74,9 @@ const DWORD TS_IAS_QUERYONLY = 0x2;
|
||||
|
||||
const DWORD TS_ST_CORRECTION = 0x1;
|
||||
|
||||
+const DWORD GXFPF_ROUND_NEAREST = 0x1;
|
||||
+const DWORD GXFPF_NEAREST = 0x2;
|
||||
+
|
||||
typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd;
|
||||
typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType;
|
||||
typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;
|
||||
@ -1,91 +0,0 @@
|
||||
From a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Thu, 19 Mar 2015 14:47:34 +0100
|
||||
Subject: Added new versionhelpers.h header.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/versionhelpers.h b/mingw-w64-headers/include/versionhelpers.h
|
||||
new file mode 100644
|
||||
index 0000000..25ea414
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/versionhelpers.h
|
||||
@@ -0,0 +1,79 @@
|
||||
+/**
|
||||
+ * This file is part of the mingw-w64 runtime package.
|
||||
+ * No warranty is given; refer to the file DISCLAIMER within this package.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _INC_VERSIONHELPERS
|
||||
+#define _INC_VERSIONHELPERS
|
||||
+
|
||||
+#include <winapifamily.h>
|
||||
+
|
||||
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(__WIDL__)
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+#define VERSIONHELPERAPI inline bool
|
||||
+#else
|
||||
+#define VERSIONHELPERAPI FORCEINLINE BOOL
|
||||
+#endif
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsVersionOrGreater(WORD major, WORD minor, WORD servpack)
|
||||
+{
|
||||
+ OSVERSIONINFOEXW vi = {sizeof(vi),major,minor,0,0,{0},servpack};
|
||||
+ return VerifyVersionInfoW(&vi, VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR,
|
||||
+ VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0,
|
||||
+ VER_MAJORVERSION,VER_GREATER_EQUAL),
|
||||
+ VER_MINORVERSION,VER_GREATER_EQUAL),
|
||||
+ VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL));
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsXPOrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsXPSP1OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 1);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsXPSP2OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 2);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsXPSP3OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 3);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsVistaOrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsVistaSP1OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 1);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsVistaSP2OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 2);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindows7OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindows7SP1OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 1);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindows8OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindows8Point1OrGreater(void) {
|
||||
+ return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0);
|
||||
+}
|
||||
+
|
||||
+VERSIONHELPERAPI IsWindowsServer(void) {
|
||||
+ OSVERSIONINFOEXW vi = {sizeof(vi),0,0,0,0,{0},0,0,0,VER_NT_WORKSTATION};
|
||||
+ return !VerifyVersionInfoW(&vi, VER_PRODUCT_TYPE, VerSetConditionMask(0, VER_PRODUCT_TYPE, VER_EQUAL));
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+#endif
|
||||
@ -1,18 +0,0 @@
|
||||
From b3d0437c9e9e5a9156077b478da981abd11a2510 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Mon, 6 Jul 2015 11:55:50 +0200
|
||||
Subject: sal.h: Added _Inout_ define.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/sal.h b/mingw-w64-headers/include/sal.h
|
||||
index 9987119..79a747f 100644
|
||||
--- a/mingw-w64-headers/include/sal.h
|
||||
+++ b/mingw-w64-headers/include/sal.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#define _In_
|
||||
#define _In_opt_
|
||||
#define _Out_
|
||||
+#define _Inout_
|
||||
|
||||
#define _Struct_size_bytes_(size)
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From e4a8812d72529fbaf168e50725b0ae6bf9951d23 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Thu, 12 Feb 2015 17:27:47 +0100
|
||||
Subject: d2d1_1helper.h: Added a few missing declarations.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/d2d1_1helper.h b/mingw-w64-headers/include/d2d1_1helper.h
|
||||
index 9523203..54c6539 100644
|
||||
--- a/mingw-w64-headers/include/d2d1_1helper.h
|
||||
+++ b/mingw-w64-headers/include/d2d1_1helper.h
|
||||
@@ -10,11 +10,15 @@
|
||||
#ifndef D2D_USE_C_DEFINITIONS
|
||||
|
||||
namespace D2D1 {
|
||||
+ template<> struct TypeTraits<INT32> {
|
||||
+ typedef D2D1_POINT_2L Point;
|
||||
+ typedef D2D1_RECT_L Rect;
|
||||
+ };
|
||||
|
||||
- D2D1FORCEINLINE D2D1_VECTOR_2F Vector2F(FLOAT x = 0.0f, FLOAT y = 0.0f) {
|
||||
- D2D1_VECTOR_2F r = {x, y};
|
||||
- return r;
|
||||
- }
|
||||
+ template<> struct TypeTraits<LONG> {
|
||||
+ typedef D2D1_POINT_2L Point;
|
||||
+ typedef D2D1_RECT_L Rect;
|
||||
+ };
|
||||
|
||||
D2D1FORCEINLINE D2D1_LAYER_PARAMETERS1 LayerParameters1(CONST D2D1_RECT_F &contentBounds = D2D1::InfiniteRect(),
|
||||
ID2D1Geometry *geometricMask = NULL, D2D1_ANTIALIAS_MODE maskAntialiasMode = D2D1_ANTIALIAS_MODE_PER_PRIMITIVE,
|
||||
@@ -63,6 +67,11 @@ namespace D2D1 {
|
||||
}
|
||||
};
|
||||
|
||||
+ D2D1FORCEINLINE D2D1_VECTOR_2F Vector2F(FLOAT x = 0.0f, FLOAT y = 0.0f) {
|
||||
+ D2D1_VECTOR_2F r = {x, y};
|
||||
+ return r;
|
||||
+ }
|
||||
+
|
||||
D2D1FORCEINLINE D2D1_VECTOR_3F Vector3F(FLOAT x = 0.0f, FLOAT y = 0.0f, FLOAT z = 0.0f) {
|
||||
D2D1_VECTOR_3F r = {x, y, z};
|
||||
return r;
|
||||
@@ -72,6 +81,14 @@ namespace D2D1 {
|
||||
D2D1_VECTOR_4F r = {x, y, z, w};
|
||||
return r;
|
||||
}
|
||||
+
|
||||
+ D2D1FORCEINLINE D2D1_POINT_2L Point2L(INT32 x = 0, INT32 y = 0) {
|
||||
+ return Point2<INT32>(x, y);
|
||||
+ }
|
||||
+
|
||||
+ D2D1FORCEINLINE D2D1_RECT_L RectL(INT32 left = 0.0f, INT32 top = 0.0f, INT32 right = 0.0f, INT32 bottom = 0.0f) {
|
||||
+ return Rect<INT32>(left, top, right, bottom);
|
||||
+ }
|
||||
}
|
||||
|
||||
#endif /* D2D_USE_C_DEFINITIONS */
|
||||
@ -1,19 +0,0 @@
|
||||
From e5ebc15356113a0fa2b8869a73086f6790ab3657 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Sat, 25 Jul 2015 19:03:03 +0200
|
||||
Subject: roapi.h: Fixed a typo.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/roapi.h b/mingw-w64-headers/include/roapi.h
|
||||
index 9cd0f29..14d94c3 100644
|
||||
--- a/mingw-w64-headers/include/roapi.h
|
||||
+++ b/mingw-w64-headers/include/roapi.h
|
||||
@@ -56,7 +56,7 @@ HRESULT WINAPI RoGetApartmentIdentifier (UINT64 *apartmentId);
|
||||
|
||||
namespace Windows {
|
||||
namespace Foundation {
|
||||
- __inline HRESULT Initalize (RO_INIT_TYPE it
|
||||
+ __inline HRESULT Initialize (RO_INIT_TYPE it
|
||||
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
|
||||
= RO_INIT_SINGLETHREADED
|
||||
#endif
|
||||
@ -1,34 +0,0 @@
|
||||
From e960f8fffb399036079cef960a44e86a9abebc71 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Thu, 19 Mar 2015 14:47:13 +0100
|
||||
Subject: winsdkver.h: Added *_WINBLUE defines.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/sdkddkver.h b/mingw-w64-headers/include/sdkddkver.h
|
||||
index 0433811..1b965ae 100644
|
||||
--- a/mingw-w64-headers/include/sdkddkver.h
|
||||
+++ b/mingw-w64-headers/include/sdkddkver.h
|
||||
@@ -21,6 +21,7 @@
|
||||
#define _WIN32_WINNT_LONGHORN 0x0600
|
||||
#define _WIN32_WINNT_WIN7 0x0601
|
||||
#define _WIN32_WINNT_WIN8 0x0602
|
||||
+#define _WIN32_WINNT_WINBLUE 0x0603
|
||||
|
||||
/* _WIN32_IE */
|
||||
#define _WIN32_IE_IE20 0x0200
|
||||
@@ -64,6 +65,7 @@
|
||||
#define _WIN32_IE_LONGHORN _WIN32_IE_IE70
|
||||
#define _WIN32_IE_WIN7 _WIN32_IE_IE80
|
||||
#define _WIN32_IE_WIN8 _WIN32_IE_IE100
|
||||
+#define _WIN32_IE_WINBLUE _WIN32_IE_IE100
|
||||
|
||||
/* NTDDI_VERSION */
|
||||
#ifndef NTDDI_WIN2K
|
||||
@@ -124,6 +126,7 @@
|
||||
|
||||
#define NTDDI_WIN7 0x06010000
|
||||
#define NTDDI_WIN8 0x06020000
|
||||
+#define NTDDI_WINBLUE 0x06030000
|
||||
|
||||
/* Version Fields in NTDDI_VERSION */
|
||||
#define OSVERSION_MASK 0xFFFF0000U
|
||||
@ -1,63 +0,0 @@
|
||||
From eac91922574a328ac8e1e41ab0acc21af692dbaf Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Mon, 6 Jul 2015 13:07:28 +0200
|
||||
Subject: roapi.h: Added GetActivationFactory helpers, fixed enum argument
|
||||
default value and removed version guards.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/roapi.h b/mingw-w64-headers/include/roapi.h
|
||||
index d4146ba..95c4fe6 100644
|
||||
--- a/mingw-w64-headers/include/roapi.h
|
||||
+++ b/mingw-w64-headers/include/roapi.h
|
||||
@@ -13,8 +13,6 @@
|
||||
#include <inspectable.h>
|
||||
#include <activation.h>
|
||||
|
||||
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
|
||||
-
|
||||
typedef enum RO_INIT_TYPE {
|
||||
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
|
||||
RO_INIT_SINGLETHREADED = 0,
|
||||
@@ -51,20 +49,21 @@ HRESULT WINAPI RoUnregisterForApartmentShutdown (APARTMENT_SHUTDOWN_REGISTRATION
|
||||
|
||||
HRESULT WINAPI RoGetApartmentIdentifier (UINT64 *apartmentId);
|
||||
|
||||
-#endif
|
||||
-
|
||||
#ifdef __cplusplus
|
||||
|
||||
namespace Windows {
|
||||
namespace Foundation {
|
||||
__inline HRESULT Initalize (RO_INIT_TYPE it
|
||||
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
|
||||
- = 0
|
||||
+ = RO_INIT_SINGLETHREADED
|
||||
#endif
|
||||
) { return RoInitialize (it); }
|
||||
__inline void Uninitialize ()
|
||||
{ RoUninitialize (); }
|
||||
|
||||
+ template<class T> __inline HRESULT GetActivationFactory(HSTRING classid, T **factory) {
|
||||
+ return RoGetActivationFactory(classid, IID_INS_ARGS(factory));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,12 +72,16 @@ namespace ABI {
|
||||
namespace Foundation {
|
||||
__inline HRESULT Initialze (RO_INIT_TYPE it
|
||||
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
|
||||
- = 0
|
||||
+ = RO_INIT_SINGLETHREADED
|
||||
#endif
|
||||
) { return RoInitialize (it); }
|
||||
__inline void Uninitialize ()
|
||||
{ RoUninitialize (); }
|
||||
}
|
||||
+
|
||||
+ template<class T> __inline HRESULT GetActivationFactory(HSTRING classid, T **factory) {
|
||||
+ return RoGetActivationFactory(classid, IID_INS_ARGS(factory));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
From ef5e914c022ca5a470046f47fccf984b766885bd Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Wed, 29 Apr 2015 22:01:51 +0200
|
||||
Subject: msinkaut_i.c: Added new file.
|
||||
|
||||
|
||||
diff --git a/mingw-w64-headers/include/msinkaut_i.c b/mingw-w64-headers/include/msinkaut_i.c
|
||||
new file mode 100644
|
||||
index 0000000..1edf4f7
|
||||
--- /dev/null
|
||||
+++ b/mingw-w64-headers/include/msinkaut_i.c
|
||||
@@ -0,0 +1,56 @@
|
||||
+/*** Autogenerated by WIDL 1.6 from include/msinkaut.idl - Do not edit ***/
|
||||
+
|
||||
+#include <rpc.h>
|
||||
+#include <rpcndr.h>
|
||||
+
|
||||
+#ifdef _MIDL_USE_GUIDDEF_
|
||||
+
|
||||
+#ifndef INITGUID
|
||||
+#define INITGUID
|
||||
+#include <guiddef.h>
|
||||
+#undef INITGUID
|
||||
+#else
|
||||
+#include <guiddef.h>
|
||||
+#endif
|
||||
+
|
||||
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
|
||||
+ DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
|
||||
+ const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkExtendedProperty, 0xdb489209, 0xb7c3, 0x411d, 0x90,0xf6, 0x15,0x48,0xcf,0xff,0x27,0x1e);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkExtendedProperties, 0x89f2a8be, 0x95a9, 0x4530, 0x8b,0x8f, 0x88,0xe9,0x71,0xe3,0xe2,0x5f);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkDrawingAttributes, 0xbf519b75, 0x0a15, 0x4623, 0xad,0xc9, 0xc0,0x0d,0x43,0x6a,0x80,0x92);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkRectangle, 0x9794ff82, 0x6071, 0x4717, 0x8a,0x8b, 0x6a,0xc7,0xc6,0x4a,0x68,0x6e);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkTablet, 0x2de25eaa, 0x6ef8, 0x42d5, 0xae,0xe9, 0x18,0x5b,0xc8,0x1b,0x91,0x2d);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCursorButton, 0x85ef9417, 0x1d59, 0x49b2, 0xa1,0x3c, 0x70,0x2c,0x85,0x43,0x08,0x94);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCursorButtons, 0x3671cc40, 0xb624, 0x4671, 0x9f,0xa0, 0xdb,0x11,0x9d,0x95,0x2d,0x54);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCursor, 0xad30c630, 0x40c5, 0x4350, 0x84,0x05, 0x9c,0x71,0x01,0x2f,0xc5,0x58);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkTransform, 0x615f1d43, 0x8703, 0x4565, 0x88,0xe2, 0x82,0x01,0xd2,0xec,0xd7,0xb7);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkRecognitionAlternates, 0x286a167f, 0x9f19, 0x4c61, 0x9d,0x53, 0x4f,0x07,0xbe,0x62,0x2b,0x84);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkRecognitionAlternate, 0xb7e660ad, 0x77e4, 0x429b, 0xad,0xda, 0x87,0x37,0x80,0xd1,0xfc,0x4a);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkRecognitionResult, 0x3bc129a8, 0x86cd, 0x45ad, 0xbd,0xe8, 0xe0,0xd3,0x2d,0x61,0xc1,0x6d);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkStrokeDisp, 0x43242fea, 0x91d1, 0x4a72, 0x96,0x3e, 0xfb,0xb9,0x18,0x29,0xcf,0xa2);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCustomStrokes, 0x7e23a88f, 0xc30e, 0x420f, 0x9b,0xdb, 0x28,0x90,0x25,0x43,0xf0,0xc1);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkDisp, 0x9d398fa0, 0xc4e2, 0x4fcd, 0x99,0x73, 0x97,0x5c,0xaa,0xf4,0x7e,0xa6);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkStrokes, 0xf1f4c9d8, 0x590a, 0x4963, 0xb3,0xae, 0x19,0x35,0x67,0x1b,0xb6,0xf3);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkRenderer, 0xe6257a9c, 0xb511, 0x4f4c, 0xa8,0xb0, 0xa7,0xdb,0xc9,0x50,0x6b,0x83);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCursors, 0xa248c1ac, 0xc698, 0x4e06, 0x9e,0x5c, 0xd5,0x7f,0x77,0xc7,0xe6,0x47);
|
||||
+MIDL_DEFINE_GUID(IID, IID_IInkCollector, 0xf0f060b5, 0x8b1f, 0x4a7c, 0x89,0xec, 0x88,0x06,0x92,0x58,0x8a,0x4f);
|
||||
+MIDL_DEFINE_GUID(IID, DIID__IInkCollectorEvents, 0x11a583f2, 0x712d, 0x4fea, 0xab,0xcf, 0xab,0x4a,0xf3,0x8e,0xa0,0x6b);
|
||||
+MIDL_DEFINE_GUID(CLSID, CLSID_InkCollector, 0x43fb1553, 0xad74, 0x4ee8, 0x88,0xe4, 0x3e,0x6d,0xaa,0xc9,0x15,0xdb);
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#undef MIDL_DEFINE_GUID
|
||||
7862
commit-fc960d3
7862
commit-fc960d3
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
#%%global snapshot_date 20141222
|
||||
#%%global snapshot_rev f7337bdf0d70809e720b4e2671758e0c10c16f60
|
||||
#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6)
|
||||
#%%global branch trunk
|
||||
%global snapshot_date 20151224
|
||||
%global snapshot_rev 5e2e73b7754fca77ef7635cf52c73a3885110603
|
||||
%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6)
|
||||
%global branch trunk
|
||||
|
||||
#%%global pre rc3
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
%endif
|
||||
|
||||
Name: mingw-headers
|
||||
Version: 4.0.4
|
||||
Release: 3%{?dist}
|
||||
Version: 4.9.999
|
||||
Release: 0.1.%{branch}.git%{snapshot_rev_short}.%{snapshot_date}%{?dist}
|
||||
Summary: Win32/Win64 header files
|
||||
|
||||
License: Public Domain and LGPLv2+ and ZPLv2.1
|
||||
@ -46,25 +46,6 @@ Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}
|
||||
# happening as the .idl files shouldn't be used by default
|
||||
Patch0: mingw-headers-no-widl.patch
|
||||
|
||||
# Backported commits required to build wine-gecko 2.40
|
||||
Patch1: commit-4ce7a79
|
||||
Patch2: commit-7eee339
|
||||
Patch3: commit-85b4034
|
||||
Patch4: commit-a883b47
|
||||
Patch5: commit-e4a8812
|
||||
Patch6: commit-e960f8f
|
||||
Patch7: commit-ef5e914
|
||||
Patch8: commit-fc960d3
|
||||
Patch9: commit-58b571e
|
||||
Patch10: commit-eac9192
|
||||
Patch11: commit-b3d0437
|
||||
Patch12: commit-e5ebc15
|
||||
Patch13: commit-21c9cbf
|
||||
Patch14: commit-6249fb9
|
||||
|
||||
# Backported commit required to build mingw-qt5-qtactiveqt 5.5.0
|
||||
Patch99: commit-5f5e2c1
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: mingw32-filesystem >= 95
|
||||
@ -112,25 +93,6 @@ unzip %{S:0}
|
||||
|
||||
%patch0 -p0 -b .idl
|
||||
|
||||
# wine-gecko backports
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
|
||||
# mingw-qt5-qtactiveqt backports
|
||||
%patch99 -p1
|
||||
|
||||
|
||||
%build
|
||||
pushd mingw-w64-headers
|
||||
@ -164,6 +126,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 24 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.9.999-0.1.trunk.git.5e2e73.20151224
|
||||
- Update to 20151224 snapshot (git rev 5e2e73)
|
||||
|
||||
* Fri Aug 14 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.0.4-3
|
||||
- Backport more commits which are required to build wine-gecko 2.40
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user