* Renamed ffmpeg 0.8 to ffmpeg

* Updated CHANGES.txt
* Changed working version to 2.0.7 Beta
* Removed silverlight project

diff --git a/.gitignore b/.gitignore
index 4f261bdfebc8fdee81f3601b253de244ff034569..2219f9a18b898e9239231c3f90101fa04f926d72 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,10 +60,6 @@
 /modules/ogl/tmp
 /modules/ogl/ogl.vcxproj.user
 
-# /modules/silverlight/
-/modules/silverlight/bin
-/modules/silverlight/tmp
-
 # /protocol/
 /protocol/bin
 /protocol/tmp

diff --git a/CHANGES.txt b/CHANGES.txt
index 29a9b53c5d87001e3b33799c6f989b0caac609e6..179537c97de86e542b9747ae28683c6abf816367 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,15 @@
 C H A N G E S\r
 \r
+CasparCG 2.0.7 Beta (as compared to 2.0.6 Stable)\r
+=================================================\r
+\r
+General\r
+-------\r
+  o FFmpeg: Upgraded to master and adapted CasparCG to FFmpeg API changes\r
+    (Robert Nagy)\r
+\r
+\r
+\r
 CasparCG 2.0.6 Stable (as compared to 2.0.4 Stable)\r
 ===================================================\r
 \r

diff --git a/dependencies/ffmpeg 0.8/README.txt b/dependencies/ffmpeg/README.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/README.txt
rename to dependencies/ffmpeg/README.txt

diff --git a/dependencies/ffmpeg 0.8/bin/avcodec-55.dll b/dependencies/ffmpeg/bin/avcodec-55.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/avcodec-55.dll
rename to dependencies/ffmpeg/bin/avcodec-55.dll

diff --git a/dependencies/ffmpeg 0.8/bin/avdevice-55.dll b/dependencies/ffmpeg/bin/avdevice-55.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/avdevice-55.dll
rename to dependencies/ffmpeg/bin/avdevice-55.dll

diff --git a/dependencies/ffmpeg 0.8/bin/avfilter-3.dll b/dependencies/ffmpeg/bin/avfilter-3.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/avfilter-3.dll
rename to dependencies/ffmpeg/bin/avfilter-3.dll

diff --git a/dependencies/ffmpeg 0.8/bin/avformat-55.dll b/dependencies/ffmpeg/bin/avformat-55.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/avformat-55.dll
rename to dependencies/ffmpeg/bin/avformat-55.dll

diff --git a/dependencies/ffmpeg 0.8/bin/avutil-52.dll b/dependencies/ffmpeg/bin/avutil-52.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/avutil-52.dll
rename to dependencies/ffmpeg/bin/avutil-52.dll

diff --git a/dependencies/ffmpeg 0.8/bin/ffmpeg.exe b/dependencies/ffmpeg/bin/ffmpeg.exe
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/ffmpeg.exe
rename to dependencies/ffmpeg/bin/ffmpeg.exe

diff --git a/dependencies/ffmpeg 0.8/bin/ffplay.exe b/dependencies/ffmpeg/bin/ffplay.exe
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/ffplay.exe
rename to dependencies/ffmpeg/bin/ffplay.exe

diff --git a/dependencies/ffmpeg 0.8/bin/ffprobe.exe b/dependencies/ffmpeg/bin/ffprobe.exe
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/ffprobe.exe
rename to dependencies/ffmpeg/bin/ffprobe.exe

diff --git a/dependencies/ffmpeg 0.8/bin/postproc-52.dll b/dependencies/ffmpeg/bin/postproc-52.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/postproc-52.dll
rename to dependencies/ffmpeg/bin/postproc-52.dll

diff --git a/dependencies/ffmpeg 0.8/bin/swresample-0.dll b/dependencies/ffmpeg/bin/swresample-0.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/swresample-0.dll
rename to dependencies/ffmpeg/bin/swresample-0.dll

diff --git a/dependencies/ffmpeg 0.8/bin/swscale-2.dll b/dependencies/ffmpeg/bin/swscale-2.dll
similarity index 100%
rename from dependencies/ffmpeg 0.8/bin/swscale-2.dll
rename to dependencies/ffmpeg/bin/swscale-2.dll

diff --git a/dependencies/ffmpeg 0.8/doc/developer.html b/dependencies/ffmpeg/doc/developer.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/developer.html
rename to dependencies/ffmpeg/doc/developer.html

diff --git a/dependencies/ffmpeg 0.8/doc/faq.html b/dependencies/ffmpeg/doc/faq.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/faq.html
rename to dependencies/ffmpeg/doc/faq.html

diff --git a/dependencies/ffmpeg 0.8/doc/ffmpeg.html b/dependencies/ffmpeg/doc/ffmpeg.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/ffmpeg.html
rename to dependencies/ffmpeg/doc/ffmpeg.html

diff --git a/dependencies/ffmpeg 0.8/doc/ffplay.html b/dependencies/ffmpeg/doc/ffplay.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/ffplay.html
rename to dependencies/ffmpeg/doc/ffplay.html

diff --git a/dependencies/ffmpeg 0.8/doc/ffprobe.html b/dependencies/ffmpeg/doc/ffprobe.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/ffprobe.html
rename to dependencies/ffmpeg/doc/ffprobe.html

diff --git a/dependencies/ffmpeg 0.8/doc/general.html b/dependencies/ffmpeg/doc/general.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/general.html
rename to dependencies/ffmpeg/doc/general.html

diff --git a/dependencies/ffmpeg 0.8/doc/libavfilter.html b/dependencies/ffmpeg/doc/libavfilter.html
similarity index 100%
rename from dependencies/ffmpeg 0.8/doc/libavfilter.html
rename to dependencies/ffmpeg/doc/libavfilter.html

diff --git a/dependencies/ffmpeg 0.8/include/inttypes.h b/dependencies/ffmpeg/include/inttypes.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/inttypes.h
rename to dependencies/ffmpeg/include/inttypes.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/avcodec.h b/dependencies/ffmpeg/include/libavcodec/avcodec.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/avcodec.h
rename to dependencies/ffmpeg/include/libavcodec/avcodec.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/avfft.h b/dependencies/ffmpeg/include/libavcodec/avfft.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/avfft.h
rename to dependencies/ffmpeg/include/libavcodec/avfft.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/dxva2.h b/dependencies/ffmpeg/include/libavcodec/dxva2.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/dxva2.h
rename to dependencies/ffmpeg/include/libavcodec/dxva2.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/old_codec_ids.h b/dependencies/ffmpeg/include/libavcodec/old_codec_ids.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/old_codec_ids.h
rename to dependencies/ffmpeg/include/libavcodec/old_codec_ids.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/vaapi.h b/dependencies/ffmpeg/include/libavcodec/vaapi.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/vaapi.h
rename to dependencies/ffmpeg/include/libavcodec/vaapi.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/vda.h b/dependencies/ffmpeg/include/libavcodec/vda.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/vda.h
rename to dependencies/ffmpeg/include/libavcodec/vda.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/vdpau.h b/dependencies/ffmpeg/include/libavcodec/vdpau.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/vdpau.h
rename to dependencies/ffmpeg/include/libavcodec/vdpau.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/version.h b/dependencies/ffmpeg/include/libavcodec/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/version.h
rename to dependencies/ffmpeg/include/libavcodec/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libavcodec/xvmc.h b/dependencies/ffmpeg/include/libavcodec/xvmc.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavcodec/xvmc.h
rename to dependencies/ffmpeg/include/libavcodec/xvmc.h

diff --git a/dependencies/ffmpeg 0.8/include/libavdevice/avdevice.h b/dependencies/ffmpeg/include/libavdevice/avdevice.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavdevice/avdevice.h
rename to dependencies/ffmpeg/include/libavdevice/avdevice.h

diff --git a/dependencies/ffmpeg 0.8/include/libavdevice/version.h b/dependencies/ffmpeg/include/libavdevice/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavdevice/version.h
rename to dependencies/ffmpeg/include/libavdevice/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/asrc_abuffer.h b/dependencies/ffmpeg/include/libavfilter/asrc_abuffer.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/asrc_abuffer.h
rename to dependencies/ffmpeg/include/libavfilter/asrc_abuffer.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/avcodec.h b/dependencies/ffmpeg/include/libavfilter/avcodec.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/avcodec.h
rename to dependencies/ffmpeg/include/libavfilter/avcodec.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/avfilter.h b/dependencies/ffmpeg/include/libavfilter/avfilter.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/avfilter.h
rename to dependencies/ffmpeg/include/libavfilter/avfilter.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/avfiltergraph.h b/dependencies/ffmpeg/include/libavfilter/avfiltergraph.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/avfiltergraph.h
rename to dependencies/ffmpeg/include/libavfilter/avfiltergraph.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/buffersink.h b/dependencies/ffmpeg/include/libavfilter/buffersink.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/buffersink.h
rename to dependencies/ffmpeg/include/libavfilter/buffersink.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/buffersrc.h b/dependencies/ffmpeg/include/libavfilter/buffersrc.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/buffersrc.h
rename to dependencies/ffmpeg/include/libavfilter/buffersrc.h

diff --git a/dependencies/ffmpeg 0.8/include/libavfilter/version.h b/dependencies/ffmpeg/include/libavfilter/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavfilter/version.h
rename to dependencies/ffmpeg/include/libavfilter/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libavformat/avformat.h b/dependencies/ffmpeg/include/libavformat/avformat.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavformat/avformat.h
rename to dependencies/ffmpeg/include/libavformat/avformat.h

diff --git a/dependencies/ffmpeg 0.8/include/libavformat/avio.h b/dependencies/ffmpeg/include/libavformat/avio.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavformat/avio.h
rename to dependencies/ffmpeg/include/libavformat/avio.h

diff --git a/dependencies/ffmpeg 0.8/include/libavformat/version.h b/dependencies/ffmpeg/include/libavformat/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavformat/version.h
rename to dependencies/ffmpeg/include/libavformat/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/adler32.h b/dependencies/ffmpeg/include/libavutil/adler32.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/adler32.h
rename to dependencies/ffmpeg/include/libavutil/adler32.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/aes.h b/dependencies/ffmpeg/include/libavutil/aes.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/aes.h
rename to dependencies/ffmpeg/include/libavutil/aes.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/attributes.h b/dependencies/ffmpeg/include/libavutil/attributes.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/attributes.h
rename to dependencies/ffmpeg/include/libavutil/attributes.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/audio_fifo.h b/dependencies/ffmpeg/include/libavutil/audio_fifo.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/audio_fifo.h
rename to dependencies/ffmpeg/include/libavutil/audio_fifo.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/audioconvert.h b/dependencies/ffmpeg/include/libavutil/audioconvert.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/audioconvert.h
rename to dependencies/ffmpeg/include/libavutil/audioconvert.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/avassert.h b/dependencies/ffmpeg/include/libavutil/avassert.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/avassert.h
rename to dependencies/ffmpeg/include/libavutil/avassert.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/avconfig.h b/dependencies/ffmpeg/include/libavutil/avconfig.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/avconfig.h
rename to dependencies/ffmpeg/include/libavutil/avconfig.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/avstring.h b/dependencies/ffmpeg/include/libavutil/avstring.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/avstring.h
rename to dependencies/ffmpeg/include/libavutil/avstring.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/avutil.h b/dependencies/ffmpeg/include/libavutil/avutil.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/avutil.h
rename to dependencies/ffmpeg/include/libavutil/avutil.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/base64.h b/dependencies/ffmpeg/include/libavutil/base64.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/base64.h
rename to dependencies/ffmpeg/include/libavutil/base64.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/blowfish.h b/dependencies/ffmpeg/include/libavutil/blowfish.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/blowfish.h
rename to dependencies/ffmpeg/include/libavutil/blowfish.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/bprint.h b/dependencies/ffmpeg/include/libavutil/bprint.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/bprint.h
rename to dependencies/ffmpeg/include/libavutil/bprint.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/bswap.h b/dependencies/ffmpeg/include/libavutil/bswap.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/bswap.h
rename to dependencies/ffmpeg/include/libavutil/bswap.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/buffer.h b/dependencies/ffmpeg/include/libavutil/buffer.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/buffer.h
rename to dependencies/ffmpeg/include/libavutil/buffer.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/channel_layout.h b/dependencies/ffmpeg/include/libavutil/channel_layout.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/channel_layout.h
rename to dependencies/ffmpeg/include/libavutil/channel_layout.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/common.h b/dependencies/ffmpeg/include/libavutil/common.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/common.h
rename to dependencies/ffmpeg/include/libavutil/common.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/cpu.h b/dependencies/ffmpeg/include/libavutil/cpu.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/cpu.h
rename to dependencies/ffmpeg/include/libavutil/cpu.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/crc.h b/dependencies/ffmpeg/include/libavutil/crc.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/crc.h
rename to dependencies/ffmpeg/include/libavutil/crc.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/dict.h b/dependencies/ffmpeg/include/libavutil/dict.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/dict.h
rename to dependencies/ffmpeg/include/libavutil/dict.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/error.h b/dependencies/ffmpeg/include/libavutil/error.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/error.h
rename to dependencies/ffmpeg/include/libavutil/error.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/eval.h b/dependencies/ffmpeg/include/libavutil/eval.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/eval.h
rename to dependencies/ffmpeg/include/libavutil/eval.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/ffversion.h b/dependencies/ffmpeg/include/libavutil/ffversion.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/ffversion.h
rename to dependencies/ffmpeg/include/libavutil/ffversion.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/fifo.h b/dependencies/ffmpeg/include/libavutil/fifo.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/fifo.h
rename to dependencies/ffmpeg/include/libavutil/fifo.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/file.h b/dependencies/ffmpeg/include/libavutil/file.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/file.h
rename to dependencies/ffmpeg/include/libavutil/file.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/frame.h b/dependencies/ffmpeg/include/libavutil/frame.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/frame.h
rename to dependencies/ffmpeg/include/libavutil/frame.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/hmac.h b/dependencies/ffmpeg/include/libavutil/hmac.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/hmac.h
rename to dependencies/ffmpeg/include/libavutil/hmac.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/imgutils.h b/dependencies/ffmpeg/include/libavutil/imgutils.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/imgutils.h
rename to dependencies/ffmpeg/include/libavutil/imgutils.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/intfloat.h b/dependencies/ffmpeg/include/libavutil/intfloat.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/intfloat.h
rename to dependencies/ffmpeg/include/libavutil/intfloat.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/intfloat_readwrite.h b/dependencies/ffmpeg/include/libavutil/intfloat_readwrite.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/intfloat_readwrite.h
rename to dependencies/ffmpeg/include/libavutil/intfloat_readwrite.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/intreadwrite.h b/dependencies/ffmpeg/include/libavutil/intreadwrite.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/intreadwrite.h
rename to dependencies/ffmpeg/include/libavutil/intreadwrite.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/lfg.h b/dependencies/ffmpeg/include/libavutil/lfg.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/lfg.h
rename to dependencies/ffmpeg/include/libavutil/lfg.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/log.h b/dependencies/ffmpeg/include/libavutil/log.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/log.h
rename to dependencies/ffmpeg/include/libavutil/log.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/lzo.h b/dependencies/ffmpeg/include/libavutil/lzo.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/lzo.h
rename to dependencies/ffmpeg/include/libavutil/lzo.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/mathematics.h b/dependencies/ffmpeg/include/libavutil/mathematics.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/mathematics.h
rename to dependencies/ffmpeg/include/libavutil/mathematics.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/md5.h b/dependencies/ffmpeg/include/libavutil/md5.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/md5.h
rename to dependencies/ffmpeg/include/libavutil/md5.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/mem.h b/dependencies/ffmpeg/include/libavutil/mem.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/mem.h
rename to dependencies/ffmpeg/include/libavutil/mem.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/murmur3.h b/dependencies/ffmpeg/include/libavutil/murmur3.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/murmur3.h
rename to dependencies/ffmpeg/include/libavutil/murmur3.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/old_pix_fmts.h b/dependencies/ffmpeg/include/libavutil/old_pix_fmts.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/old_pix_fmts.h
rename to dependencies/ffmpeg/include/libavutil/old_pix_fmts.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/opt.h b/dependencies/ffmpeg/include/libavutil/opt.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/opt.h
rename to dependencies/ffmpeg/include/libavutil/opt.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/parseutils.h b/dependencies/ffmpeg/include/libavutil/parseutils.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/parseutils.h
rename to dependencies/ffmpeg/include/libavutil/parseutils.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/pixdesc.h b/dependencies/ffmpeg/include/libavutil/pixdesc.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/pixdesc.h
rename to dependencies/ffmpeg/include/libavutil/pixdesc.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/pixfmt.h b/dependencies/ffmpeg/include/libavutil/pixfmt.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/pixfmt.h
rename to dependencies/ffmpeg/include/libavutil/pixfmt.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/random_seed.h b/dependencies/ffmpeg/include/libavutil/random_seed.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/random_seed.h
rename to dependencies/ffmpeg/include/libavutil/random_seed.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/rational.h b/dependencies/ffmpeg/include/libavutil/rational.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/rational.h
rename to dependencies/ffmpeg/include/libavutil/rational.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/ripemd.h b/dependencies/ffmpeg/include/libavutil/ripemd.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/ripemd.h
rename to dependencies/ffmpeg/include/libavutil/ripemd.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/samplefmt.h b/dependencies/ffmpeg/include/libavutil/samplefmt.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/samplefmt.h
rename to dependencies/ffmpeg/include/libavutil/samplefmt.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/sha.h b/dependencies/ffmpeg/include/libavutil/sha.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/sha.h
rename to dependencies/ffmpeg/include/libavutil/sha.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/sha512.h b/dependencies/ffmpeg/include/libavutil/sha512.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/sha512.h
rename to dependencies/ffmpeg/include/libavutil/sha512.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/stereo3d.h b/dependencies/ffmpeg/include/libavutil/stereo3d.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/stereo3d.h
rename to dependencies/ffmpeg/include/libavutil/stereo3d.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/time.h b/dependencies/ffmpeg/include/libavutil/time.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/time.h
rename to dependencies/ffmpeg/include/libavutil/time.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/timecode.h b/dependencies/ffmpeg/include/libavutil/timecode.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/timecode.h
rename to dependencies/ffmpeg/include/libavutil/timecode.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/timestamp.h b/dependencies/ffmpeg/include/libavutil/timestamp.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/timestamp.h
rename to dependencies/ffmpeg/include/libavutil/timestamp.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/version.h b/dependencies/ffmpeg/include/libavutil/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/version.h
rename to dependencies/ffmpeg/include/libavutil/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libavutil/xtea.h b/dependencies/ffmpeg/include/libavutil/xtea.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libavutil/xtea.h
rename to dependencies/ffmpeg/include/libavutil/xtea.h

diff --git a/dependencies/ffmpeg 0.8/include/libpostproc/postprocess.h b/dependencies/ffmpeg/include/libpostproc/postprocess.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libpostproc/postprocess.h
rename to dependencies/ffmpeg/include/libpostproc/postprocess.h

diff --git a/dependencies/ffmpeg 0.8/include/libpostproc/version.h b/dependencies/ffmpeg/include/libpostproc/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libpostproc/version.h
rename to dependencies/ffmpeg/include/libpostproc/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libswresample/swresample.h b/dependencies/ffmpeg/include/libswresample/swresample.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libswresample/swresample.h
rename to dependencies/ffmpeg/include/libswresample/swresample.h

diff --git a/dependencies/ffmpeg 0.8/include/libswresample/version.h b/dependencies/ffmpeg/include/libswresample/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libswresample/version.h
rename to dependencies/ffmpeg/include/libswresample/version.h

diff --git a/dependencies/ffmpeg 0.8/include/libswscale/swscale.h b/dependencies/ffmpeg/include/libswscale/swscale.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libswscale/swscale.h
rename to dependencies/ffmpeg/include/libswscale/swscale.h

diff --git a/dependencies/ffmpeg 0.8/include/libswscale/version.h b/dependencies/ffmpeg/include/libswscale/version.h
similarity index 100%
rename from dependencies/ffmpeg 0.8/include/libswscale/version.h
rename to dependencies/ffmpeg/include/libswscale/version.h

diff --git a/dependencies/ffmpeg 0.8/lib/avcodec-55.def b/dependencies/ffmpeg/lib/avcodec-55.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avcodec-55.def
rename to dependencies/ffmpeg/lib/avcodec-55.def

diff --git a/dependencies/ffmpeg 0.8/lib/avcodec.lib b/dependencies/ffmpeg/lib/avcodec.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avcodec.lib
rename to dependencies/ffmpeg/lib/avcodec.lib

diff --git a/dependencies/ffmpeg 0.8/lib/avdevice-55.def b/dependencies/ffmpeg/lib/avdevice-55.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avdevice-55.def
rename to dependencies/ffmpeg/lib/avdevice-55.def

diff --git a/dependencies/ffmpeg 0.8/lib/avdevice.lib b/dependencies/ffmpeg/lib/avdevice.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avdevice.lib
rename to dependencies/ffmpeg/lib/avdevice.lib

diff --git a/dependencies/ffmpeg 0.8/lib/avfilter-3.def b/dependencies/ffmpeg/lib/avfilter-3.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avfilter-3.def
rename to dependencies/ffmpeg/lib/avfilter-3.def

diff --git a/dependencies/ffmpeg 0.8/lib/avfilter.lib b/dependencies/ffmpeg/lib/avfilter.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avfilter.lib
rename to dependencies/ffmpeg/lib/avfilter.lib

diff --git a/dependencies/ffmpeg 0.8/lib/avformat-55.def b/dependencies/ffmpeg/lib/avformat-55.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avformat-55.def
rename to dependencies/ffmpeg/lib/avformat-55.def

diff --git a/dependencies/ffmpeg 0.8/lib/avformat.lib b/dependencies/ffmpeg/lib/avformat.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avformat.lib
rename to dependencies/ffmpeg/lib/avformat.lib

diff --git a/dependencies/ffmpeg 0.8/lib/avutil-52.def b/dependencies/ffmpeg/lib/avutil-52.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avutil-52.def
rename to dependencies/ffmpeg/lib/avutil-52.def

diff --git a/dependencies/ffmpeg 0.8/lib/avutil.lib b/dependencies/ffmpeg/lib/avutil.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/avutil.lib
rename to dependencies/ffmpeg/lib/avutil.lib

diff --git a/dependencies/ffmpeg 0.8/lib/libavcodec.dll.a b/dependencies/ffmpeg/lib/libavcodec.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libavcodec.dll.a
rename to dependencies/ffmpeg/lib/libavcodec.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libavdevice.dll.a b/dependencies/ffmpeg/lib/libavdevice.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libavdevice.dll.a
rename to dependencies/ffmpeg/lib/libavdevice.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libavfilter.dll.a b/dependencies/ffmpeg/lib/libavfilter.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libavfilter.dll.a
rename to dependencies/ffmpeg/lib/libavfilter.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libavformat.dll.a b/dependencies/ffmpeg/lib/libavformat.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libavformat.dll.a
rename to dependencies/ffmpeg/lib/libavformat.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libavutil.dll.a b/dependencies/ffmpeg/lib/libavutil.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libavutil.dll.a
rename to dependencies/ffmpeg/lib/libavutil.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libpostproc.dll.a b/dependencies/ffmpeg/lib/libpostproc.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libpostproc.dll.a
rename to dependencies/ffmpeg/lib/libpostproc.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libswresample.dll.a b/dependencies/ffmpeg/lib/libswresample.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libswresample.dll.a
rename to dependencies/ffmpeg/lib/libswresample.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/libswscale.dll.a b/dependencies/ffmpeg/lib/libswscale.dll.a
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/libswscale.dll.a
rename to dependencies/ffmpeg/lib/libswscale.dll.a

diff --git a/dependencies/ffmpeg 0.8/lib/postproc-52.def b/dependencies/ffmpeg/lib/postproc-52.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/postproc-52.def
rename to dependencies/ffmpeg/lib/postproc-52.def

diff --git a/dependencies/ffmpeg 0.8/lib/postproc.lib b/dependencies/ffmpeg/lib/postproc.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/postproc.lib
rename to dependencies/ffmpeg/lib/postproc.lib

diff --git a/dependencies/ffmpeg 0.8/lib/swresample-0.def b/dependencies/ffmpeg/lib/swresample-0.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/swresample-0.def
rename to dependencies/ffmpeg/lib/swresample-0.def

diff --git a/dependencies/ffmpeg 0.8/lib/swresample.lib b/dependencies/ffmpeg/lib/swresample.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/swresample.lib
rename to dependencies/ffmpeg/lib/swresample.lib

diff --git a/dependencies/ffmpeg 0.8/lib/swscale-2.def b/dependencies/ffmpeg/lib/swscale-2.def
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/swscale-2.def
rename to dependencies/ffmpeg/lib/swscale-2.def

diff --git a/dependencies/ffmpeg 0.8/lib/swscale.lib b/dependencies/ffmpeg/lib/swscale.lib
similarity index 100%
rename from dependencies/ffmpeg 0.8/lib/swscale.lib
rename to dependencies/ffmpeg/lib/swscale.lib

diff --git a/dependencies/ffmpeg 0.8/licenses/bzip2.txt b/dependencies/ffmpeg/licenses/bzip2.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/bzip2.txt
rename to dependencies/ffmpeg/licenses/bzip2.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/ffmpeg.txt b/dependencies/ffmpeg/licenses/ffmpeg.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/ffmpeg.txt
rename to dependencies/ffmpeg/licenses/ffmpeg.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/freetype.txt b/dependencies/ffmpeg/licenses/freetype.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/freetype.txt
rename to dependencies/ffmpeg/licenses/freetype.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/frei0r.txt b/dependencies/ffmpeg/licenses/frei0r.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/frei0r.txt
rename to dependencies/ffmpeg/licenses/frei0r.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/gsm.txt b/dependencies/ffmpeg/licenses/gsm.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/gsm.txt
rename to dependencies/ffmpeg/licenses/gsm.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/lame.txt b/dependencies/ffmpeg/licenses/lame.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/lame.txt
rename to dependencies/ffmpeg/licenses/lame.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/libvpx.txt b/dependencies/ffmpeg/licenses/libvpx.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/libvpx.txt
rename to dependencies/ffmpeg/licenses/libvpx.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/opencore-amr.txt b/dependencies/ffmpeg/licenses/opencore-amr.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/opencore-amr.txt
rename to dependencies/ffmpeg/licenses/opencore-amr.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/openjpeg.txt b/dependencies/ffmpeg/licenses/openjpeg.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/openjpeg.txt
rename to dependencies/ffmpeg/licenses/openjpeg.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/rtmp.txt b/dependencies/ffmpeg/licenses/rtmp.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/rtmp.txt
rename to dependencies/ffmpeg/licenses/rtmp.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/schroedinger.txt b/dependencies/ffmpeg/licenses/schroedinger.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/schroedinger.txt
rename to dependencies/ffmpeg/licenses/schroedinger.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/speex.txt b/dependencies/ffmpeg/licenses/speex.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/speex.txt
rename to dependencies/ffmpeg/licenses/speex.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/theora.txt b/dependencies/ffmpeg/licenses/theora.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/theora.txt
rename to dependencies/ffmpeg/licenses/theora.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/vorbis.txt b/dependencies/ffmpeg/licenses/vorbis.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/vorbis.txt
rename to dependencies/ffmpeg/licenses/vorbis.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/x264.txt b/dependencies/ffmpeg/licenses/x264.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/x264.txt
rename to dependencies/ffmpeg/licenses/x264.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/xavs.txt b/dependencies/ffmpeg/licenses/xavs.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/xavs.txt
rename to dependencies/ffmpeg/licenses/xavs.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/xvid.txt b/dependencies/ffmpeg/licenses/xvid.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/xvid.txt
rename to dependencies/ffmpeg/licenses/xvid.txt

diff --git a/dependencies/ffmpeg 0.8/licenses/zlib.txt b/dependencies/ffmpeg/licenses/zlib.txt
similarity index 100%
rename from dependencies/ffmpeg 0.8/licenses/zlib.txt
rename to dependencies/ffmpeg/licenses/zlib.txt

diff --git a/modules/bluefish/bluefish.vcxproj b/modules/bluefish/bluefish.vcxproj
index e86cb24fb261ce4948c12f93569fc2d8d0c0d6a7..0ec9076e42391b577284a1ccfa613b837c3036b4 100644 (file)
--- a/modules/bluefish/bluefish.vcxproj
+++ b/modules/bluefish/bluefish.vcxproj
@@ -75,7 +75,7 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\common;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\common;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\common;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\common;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\common;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>\r
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r

diff --git a/modules/decklink/decklink.vcxproj b/modules/decklink/decklink.vcxproj
index 7b93aaf92f1ebcbf2b10e605960d1c6a5e2cb549..46e1f6897adcfba8eb9eb5867c04e740101ea627 100644 (file)
--- a/modules/decklink/decklink.vcxproj
+++ b/modules/decklink/decklink.vcxproj
@@ -72,14 +72,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index f72856e6e68ca30eac6bef151379b04e8d218f57..4f28e7a01430e293202217e2c6ac7dc99bc76b0b 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -72,14 +72,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/flash/flash.vcxproj b/modules/flash/flash.vcxproj
index 1b8bdb8f86d4b427436b7937dcb63a543aa8084c..7abc14b9f7b3bd27bcd4feb4ad90c8305ddf297a 100644 (file)
--- a/modules/flash/flash.vcxproj
+++ b/modules/flash/flash.vcxproj
@@ -72,14 +72,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;..\..\dependencies\zlib\include\;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/image/image.vcxproj b/modules/image/image.vcxproj
index 66ac30a68b5d09daed7f3e5912ad53be3614306f..9de609d4fbc1e90c2b7896c77eea9197c47955f0 100644 (file)
--- a/modules/image/image.vcxproj
+++ b/modules/image/image.vcxproj
@@ -76,10 +76,10 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\FreeImage\Dist\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\FreeImage\Dist\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\FreeImage\Dist\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/newtek/newtek.vcxproj b/modules/newtek/newtek.vcxproj
index 5af94ce6d30e7c4d16c19f8f6e1466ce3da5b1d6..9225c25ff135b4a65097cd1843023da63e2bc996 100644 (file)
--- a/modules/newtek/newtek.vcxproj
+++ b/modules/newtek/newtek.vcxproj
@@ -75,7 +75,7 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\common;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\common;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\common;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\common;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\common;..\..\dependencies\boost\;..\..\dependencies\tbb\include\;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>

diff --git a/modules/oal/oal.vcxproj b/modules/oal/oal.vcxproj
index 9b77c1359065547950bf5f95c0fcdb953c395a7f..f3696466c8a98532ca1b114f5e808e4ee4499c5f 100644 (file)
--- a/modules/oal/oal.vcxproj
+++ b/modules/oal/oal.vcxproj
@@ -76,10 +76,10 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/ogl/ogl.vcxproj b/modules/ogl/ogl.vcxproj
index 6c12ff8984e0af64f7565d319075e02348f23b55..6b2d87e3749755c2f33629e3fbe7f257f64949db 100644 (file)
--- a/modules/ogl/ogl.vcxproj
+++ b/modules/ogl/ogl.vcxproj
@@ -72,14 +72,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg 0.8\include;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\glew-1.6.0\include;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include;..\..\dependencies\ffmpeg\include;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r

diff --git a/modules/silverlight/StdAfx.cpp b/modules/silverlight/StdAfx.cpp
deleted file mode 100644 (file)
index 2bd615b..0000000
--- a/modules/silverlight/StdAfx.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
- \r
-// stdafx.cpp : source file that includes just the standard includes\r
-//     dma.pch will be the pre-compiled header\r
-//     stdafx.obj will contain the pre-compiled type information\r
-\r
-#include "stdafx.h"\r
-\r
-// TODO: reference any additional headers you need in STDAFX.H\r
-// and not in this file\r

diff --git a/modules/silverlight/StdAfx.h b/modules/silverlight/StdAfx.h
deleted file mode 100644 (file)
index 75da809..0000000
--- a/modules/silverlight/StdAfx.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
- \r
-// stdafx.h : include file for standard system include files,\r
-//  or project specific include files that are used frequently, but\r
-//      are changed infrequently\r
-//\r
-\r
-#pragma once\r
-\r
-#include "../common/compiler/vs/disable_silly_warnings.h"\r
-\r
-#define NOMINMAX\r
-\r
-#if defined(_MSC_VER)\r
-#      ifndef _SCL_SECURE_NO_WARNINGS\r
-#              define _SCL_SECURE_NO_WARNINGS\r
-#      endif\r
-#      ifndef _CRT_SECURE_NO_WARNINGS\r
-#              define _CRT_SECURE_NO_WARNINGS\r
-#      endif\r
-#endif\r
-\r
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)\r
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_\r
-\r
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
-#ifdef _DEBUG\r
-#include <crtdbg.h>\r
-#endif\r
-\r
-#include <memory>\r
-#include <array>\r
-#include <functional>\r
-#include <algorithm>\r
-#include <vector>\r
-#include <deque>\r
-#include <queue>\r
-#include <string>\r
-#include <math.h>\r
-\r
-#include <tbb/atomic.h>\r
-#include <tbb/concurrent_queue.h>\r
-#include <tbb/concurrent_unordered_map.h>\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/parallel_for_each.h>\r
-\r
-#include <boost/assign.hpp>\r
-#include <boost/filesystem.hpp>\r
-#include <boost/foreach.hpp>\r
-#include <boost/range/algorithm.hpp>\r
-#include <boost/signals2.hpp>\r
-\r
-#include "../common/utility/string.h"\r
-#include "../common/memory/safe_ptr.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
-\r
-#include "../common/log/Log.h"\r
-#include "../common/exception/exceptions.h"\r
-#include "../common/exception/win32_exception.h"\r
-\r
-#include <assert.h>\r
-\r
-#endif\r

diff --git a/modules/silverlight/interop/XcpControlHost.cpp b/modules/silverlight/interop/XcpControlHost.cpp
deleted file mode 100644 (file)
index f2b34c6..0000000
--- a/modules/silverlight/interop/XcpControlHost.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-#include "../StdAfx.h"\r
-\r
-#include "XcpControlHost.h"\r
-#include "XcpPropertyBag.h"\r
-#include "Ocidl.h"\r
-#include "xcpctrl_h.h"\r
-\r
-#include "atlstr.h"\r
-\r
-using namespace ATL;\r
-\r
-#ifdef _MSC_VER\r
-#pragma warning (disable : 4100)\r
-#pragma warning(disable:4061)\r
-#endif\r
-\r
-XcpControlHost::XcpControlHost() \r
-       : hControlWindow(nullptr)\r
-       , m_pUnKnown(nullptr)\r
-       , m_pControl(nullptr)\r
-{\r
-}\r
-\r
-XcpControlHost::~XcpControlHost() \r
-{\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::GetHostOptions(DWORD* pdwOptions)\r
-{\r
-       *pdwOptions = XcpHostOption_EnableCrossDomainDownloads|\r
-               XcpHostOption_EnableScriptableObjectAccess|XcpHostOption_EnableHtmlDomAccess;\r
-       return S_OK;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::GetCustomAppDomain(IUnknown** ppAppDomain) \r
-{  \r
-       return S_OK;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::GetControlVersion(UINT *puMajorVersion, UINT *puMinorVersion)\r
-{\r
-       *puMajorVersion = 4;\r
-       *puMinorVersion = 50401;\r
-       return S_OK;;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::NotifyLoaded() \r
-{\r
-//     MessageBox(L"Notify Loaded", L"Silverlight Error", 0);\r
-       return S_OK;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::NotifyError(BSTR bstrError, BSTR bstrSource, long nLine, long nColumn)\r
-{\r
-       return S_OK;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::InvokeHandler(BSTR bstrName, VARIANT varParam1, VARIANT varParam2, VARIANT* pvarResult) \r
-{\r
-       return E_NOTIMPL;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::GetBaseUrl(BSTR* pbstrUrl) {\r
-\r
-       CAtlString strPath = "C:\\";\r
-       //TCHAR pBuff[255];\r
-       //GetCurrentDirectory(255, pBuff);\r
-       //strPath = pBuff;\r
-       //strPath += "\\";\r
-\r
-       *pbstrUrl = SysAllocString(strPath);\r
-\r
-       //MessageBox(*pbstrUrl, L"GetBaseUrl", 0);\r
-       return S_OK;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::GetNamedSource(BSTR bstrSourceName, BSTR* pbstrSource) \r
-{    \r
-       return E_NOTIMPL;\r
-}\r
-\r
-STDMETHODIMP XcpControlHost::DownloadUrl(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback, IStream** ppStream) \r
-{\r
-//     MessageBox(L"DownloadUrl", L"DownloadUrl", 0);\r
-       return S_FALSE;\r
-}\r
-\r
-///////////////////////////////////////////////////////////////////////////////\r
-// XcpControlHost IServiceProvider Implementation\r
-\r
-STDMETHODIMP XcpControlHost::QueryService(REFGUID rsid, REFIID riid, void** ppvObj) {\r
-       ATLASSERT(ppvObj != NULL);\r
-       if (ppvObj == NULL)\r
-               return E_POINTER;\r
-       *ppvObj = NULL;\r
-\r
-       //static const GUID IID_IXcpControlHost = \r
-       //      { 0x1B36028E, 0xB491, 0x4bb2, { 0x85, 0x84, 0x8A, 0x9E, 0x0A, 0x67, 0x7D, 0x6E }};\r
-\r
-       HRESULT hr = E_NOINTERFACE;\r
-\r
-       if ((rsid == IID_IXcpControlHost) && (riid == IID_IXcpControlHost)) {\r
-               ((IXcpControlHost*)this)->AddRef();\r
-               *ppvObj = (IXcpControlHost*)this;\r
-               hr = S_OK;\r
-       }\r
-\r
-       if ((rsid == IID_IXcpControlHost2) && (riid == IID_IXcpControlHost2)) {\r
-               ((IXcpControlHost2*)this)->AddRef();\r
-               *ppvObj = (IXcpControlHost2*)this;\r
-               hr = S_OK;\r
-       }\r
-\r
-\r
-       return hr;\r
-}\r
-\r
-///////////////////////////////////////////////////////////////////////////////\r
-// General ActiveX control embedding.\r
-\r
-\r
-HRESULT XcpControlHost::CreateXcpControl(HWND hWnd) \r
-{\r
-       AtlAxWinInit();\r
-\r
-       HRESULT hr;\r
-       static const GUID IID_IXcpControl = \r
-               { 0x1FB839CC, 0x116C, 0x4C9B, { 0xAE, 0x8E, 0x3D, 0xBB, 0x64, 0x96, 0xE3, 0x26 }};\r
-\r
-       static const GUID CLSID_XcpControl = \r
-               { 0xDFEAF541, 0xF3E1, 0x4c24, { 0xAC, 0xAC, 0x99, 0xC3, 0x07, 0x15, 0x08, 0x4A }};\r
-\r
-       static const GUID IID_IXcpControl2 = \r
-               { 0x1c3294f9, 0x891f, 0x49b1, { 0xBB, 0xAE, 0x49, 0x2a, 0x68, 0xBA, 0x10, 0xcc }};\r
-\r
-//     static const GUID CLSID_XcpControl2 = \r
-//             { 0xDFEAF541, 0xF3E1, 0x4c24, { 0xAC, 0xAC, 0x99, 0xC3, 0x07, 0x15, 0x08, 0x4A }};\r
-\r
-       //static const GUID IID_IXcpControlHost2 = \r
-       //      { 0xfb3ed7c4, 0x5797, 0x4b44, { 0x86, 0x95, 0x0c, 0x51, 0x2e, 0xa2, 0x7D, 0x8f }};\r
-       \r
-       hr = CoCreateInstance(CLSID_XcpControl, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void**)&m_pUnKnown);\r
-       \r
-       if (SUCCEEDED(hr)) \r
-       {\r
-               CComPtr<IUnknown> spUnkContainer;\r
-               hr = XcpControlHost::_CreatorClass::CreateInstance(NULL, IID_IUnknown, (void**)&spUnkContainer);\r
-               if (SUCCEEDED(hr)) \r
-               {\r
-                       CComPtr<IAxWinHostWindow> pAxWindow;\r
-\r
-                       spUnkContainer->QueryInterface(IID_IAxWinHostWindow, (void**)&pAxWindow);\r
-                       m_pUnKnown->QueryInterface(IID_IXcpControl2, (void**)&m_pControl);\r
-                       hr = pAxWindow->AttachControl(m_pUnKnown, hWnd);            \r
-                       hControlWindow = hWnd;\r
-\r
-                       IOleInPlaceActiveObject *pObj;\r
-                       hr = m_pControl->QueryInterface(IID_IOleInPlaceActiveObject, (void**)&pObj);\r
-               }\r
-       }\r
-       return hr;\r
-}\r
-\r
-HRESULT XcpControlHost::DestroyXcpControl()\r
-{\r
-       HRESULT hr = S_OK;\r
-       if (m_pControl)\r
-       {\r
-               m_pControl->Release();\r
-       }\r
-       if (m_pUnKnown)\r
-       {\r
-               m_pUnKnown->Release();\r
-       }\r
-       return hr;\r
-}\r
-\r
-\r
-STDMETHODIMP XcpControlHost::AttachControl(IUnknown* pUnKnown, HWND hWnd) {\r
-       ReleaseAll();\r
-\r
-       HRESULT hr = S_FALSE;\r
-       BOOL fReleaseWindowOnFailure = FALSE;\r
-\r
-       if ((m_hWnd != NULL) && (m_hWnd != hWnd)) {\r
-               // Don't release the window if it's the same as the one we already subclass/own\r
-               RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_INTERNALPAINT | RDW_FRAME);\r
-               ReleaseWindow();\r
-       }\r
-\r
-       if (::IsWindow(hWnd)) {\r
-               if (m_hWnd != hWnd) {\r
-                       // Don't need to subclass the window if we already own it\r
-                       SubclassWindow(hWnd);\r
-                       fReleaseWindowOnFailure = TRUE;\r
-               }\r
-\r
-               hr = ActivateXcpControl(pUnKnown);\r
-               if (FAILED(hr)) {\r
-                       ReleaseAll();\r
-\r
-                       if (m_hWnd != NULL) {\r
-                               RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_INTERNALPAINT | RDW_FRAME);\r
-\r
-                               if (fReleaseWindowOnFailure) {\r
-                                       // We subclassed the window in an attempt to create this control, so we unsubclass on failure\r
-                                       ReleaseWindow();\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       return hr;\r
-}\r
-\r
-HRESULT XcpControlHost::ActivateXcpControl(IUnknown* pUnKnown) \r
-{\r
-       if (pUnKnown == NULL)\r
-       {\r
-               return S_OK;\r
-       }\r
-\r
-       m_spUnknown = pUnKnown;\r
-\r
-       HRESULT hr = S_OK;\r
-       pUnKnown->QueryInterface(__uuidof(IOleObject), (void**)&m_spOleObject);\r
-       if (m_spOleObject) \r
-       {\r
-               m_spOleObject->GetMiscStatus(DVASPECT_CONTENT, &m_dwMiscStatus);\r
-               if (m_dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST) \r
-               {\r
-                       CComQIPtr<IOleClientSite> spClientSite(GetControllingUnknown());\r
-                       m_spOleObject->SetClientSite(spClientSite);\r
-               }\r
-\r
-               CComQIPtr<IPersistPropertyBag> pPersist(m_spOleObject);\r
-\r
-               if (pPersist != NULL) \r
-               {\r
-                       IPropertyBag* pPropBag = new XcpPropertyBag();\r
-                       pPropBag->AddRef();\r
-\r
-                       pPersist->Load((IPropertyBag*)pPropBag, NULL);\r
-                       pPropBag->Release();\r
-               }\r
-\r
-               if (0 == (m_dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST)) \r
-               {\r
-                       CComQIPtr<IOleClientSite> spClientSite(GetControllingUnknown());\r
-                       m_spOleObject->SetClientSite(spClientSite);\r
-               }\r
-\r
-               m_dwViewObjectType = 0;\r
-               hr = m_spOleObject->QueryInterface(__uuidof(IViewObjectEx), (void**) &m_spViewObject);\r
-               if (FAILED(hr)) \r
-               {\r
-                       hr = m_spOleObject->QueryInterface(__uuidof(IViewObject2), (void**) &m_spViewObject);\r
-                       if (SUCCEEDED(hr)) {\r
-                               m_dwViewObjectType = 3;\r
-                       }\r
-               }\r
-               else {\r
-                       m_dwViewObjectType = 7;\r
-               }\r
-\r
-               if (FAILED(hr)) \r
-               {\r
-                       hr = m_spOleObject->QueryInterface(__uuidof(IViewObject), (void**) &m_spViewObject);\r
-                       if (SUCCEEDED(hr))\r
-                               m_dwViewObjectType = 1;\r
-               }\r
-\r
-               CComQIPtr<IAdviseSink> spAdviseSink(GetControllingUnknown());\r
-               m_spOleObject->Advise(spAdviseSink, &m_dwOleObject);\r
-               if (m_spViewObject) \r
-               {\r
-                       m_spViewObject->SetAdvise(DVASPECT_CONTENT, 0, spAdviseSink);\r
-               }\r
-\r
-               m_spOleObject->SetHostNames(OLESTR("AXWIN"), NULL);\r
-\r
-               if ((m_dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME) == 0) \r
-               {\r
-                       GetClientRect(&m_rcPos);\r
-\r
-                       m_pxSize.cx =  m_rcPos.right - m_rcPos.left;\r
-                       m_pxSize.cy =  m_rcPos.bottom - m_rcPos.top;\r
-                       AtlPixelToHiMetric(&m_pxSize, &m_hmSize);\r
-                       m_spOleObject->SetExtent(DVASPECT_CONTENT, &m_hmSize);\r
-                       m_spOleObject->GetExtent(DVASPECT_CONTENT, &m_hmSize);\r
-                       AtlHiMetricToPixel(&m_hmSize, &m_pxSize);\r
-                       m_rcPos.right = m_rcPos.left + m_pxSize.cx ;\r
-                       m_rcPos.bottom = m_rcPos.top + m_pxSize.cy ;\r
-\r
-                       CComQIPtr<IOleClientSite> spClientSite(GetControllingUnknown());\r
-                       hr = m_spOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, spClientSite, 0, m_hWnd, &m_rcPos);\r
-                       RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_INTERNALPAINT | RDW_FRAME);\r
-               }\r
-       }\r
-\r
-       CComPtr<IObjectWithSite> spSite;\r
-       pUnKnown->QueryInterface(__uuidof(IObjectWithSite), (void**)&spSite);\r
-       if (spSite != NULL) \r
-       {\r
-               spSite->SetSite(GetControllingUnknown());\r
-       }\r
-\r
-       return hr;\r
-}\r

diff --git a/modules/silverlight/interop/XcpControlHost.h b/modules/silverlight/interop/XcpControlHost.h
deleted file mode 100644 (file)
index 1098b95..0000000
--- a/modules/silverlight/interop/XcpControlHost.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// XcpControlHost.h : Declaration of the XcpControlHost\r
-\r
-#pragma once\r
-\r
-#include <atlbase.h>\r
-#include <atlcom.h>\r
-#include <atlctl.h>\r
-\r
-#include "xcpctrl_h.h"\r
-\r
-#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)\r
-#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."\r
-#endif\r
-\r
-\r
-class XcpControlHost \r
-       : public ATL::CAxHostWindow\r
-       , public IXcpControlHost2\r
-{\r
-       HWND hControlWindow;\r
-       IUnknown* m_pUnKnown;\r
-       IXcpControl2* m_pControl;\r
-public: \r
-       XcpControlHost();\r
-       ~XcpControlHost();\r
-\r
-       typedef enum\r
-       {\r
-               XcpHostOption_FreezeOnInitialFrame       = 0x001,\r
-               XcpHostOption_DisableFullScreen          = 0x002,\r
-               XcpHostOption_DisableManagedExecution    = 0x008,\r
-               XcpHostOption_EnableCrossDomainDownloads = 0x010,\r
-               XcpHostOption_UseCustomAppDomain         = 0x020,\r
-               XcpHostOption_DisableNetworking          = 0x040,        \r
-               XcpHostOption_DisableScriptCallouts      = 0x080,\r
-               XcpHostOption_EnableHtmlDomAccess        = 0x100,\r
-               XcpHostOption_EnableScriptableObjectAccess = 0x200,\r
-       } XcpHostOptions;\r
-\r
-       \r
-   // IXcpControlHost implementation declarations\r
-       STDMETHOD(GetHostOptions)(DWORD* pdwOptions);\r
-       STDMETHOD(NotifyLoaded)();\r
-       STDMETHOD(NotifyError)(BSTR bstrError, BSTR bstrSource, long nLine, long nColumn);\r
-       STDMETHOD(InvokeHandler)(BSTR bstrName, VARIANT varParam1, VARIANT varParam2, VARIANT* pvarResult);\r
-       STDMETHOD(GetBaseUrl)(BSTR* pbstrUrl);\r
-       STDMETHOD(GetNamedSource)(BSTR bstrSourceID, BSTR* pbstrSource);\r
-       STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback, IStream** ppStream);\r
-       STDMETHOD(GetCustomAppDomain)(IUnknown** ppAppDomain);\r
-       STDMETHOD(GetControlVersion)(UINT *puMajorVersion, UINT *puMinorVersion);\r
-       \r
-       // Infrastructure for control creation.\r
-       HRESULT CreateXcpControl(HWND hwnd);\r
-       HRESULT DestroyXcpControl();\r
-\r
-       DECLARE_NOT_AGGREGATABLE(XcpControlHost);\r
-\r
-       BEGIN_COM_MAP(XcpControlHost)\r
-               COM_INTERFACE_ENTRY(IXcpControlHost2)\r
-               COM_INTERFACE_ENTRY_CHAIN(CAxHostWindow)\r
-       END_COM_MAP()\r
-       \r
-       BEGIN_MSG_MAP(XcpControlHost)\r
-          CHAIN_MSG_MAP(CAxHostWindow)\r
-       END_MSG_MAP()\r
-\r
-       //IServiceProvider Implementation\r
-       STDMETHOD(QueryService)(REFGUID rsid, REFIID riid, void** ppvObj);\r
-\r
-       // ATL Overrides\r
-       STDMETHOD(AttachControl)(IUnknown* pUnkControl, HWND hWnd);\r
-       HRESULT ActivateXcpControl(IUnknown* pUnkControl);\r
-       \r
-       IXcpControl2* GetXcpControlPtr()\r
-       {\r
-               return m_pControl;\r
-       }\r
-};\r
-\r

diff --git a/modules/silverlight/interop/XcpPropertyBag.cpp b/modules/silverlight/interop/XcpPropertyBag.cpp
deleted file mode 100644 (file)
index 3a9a689..0000000
--- a/modules/silverlight/interop/XcpPropertyBag.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "../StdAfx.h"\r
-\r
-#include "XcpPropertyBag.h"\r
-\r
-#ifdef _MSC_VER\r
-#pragma warning (disable : 4100)\r
-#endif\r
-\r
-XcpPropertyBag::XcpPropertyBag(){m_RefCount=0;}\r
-XcpPropertyBag::~XcpPropertyBag(){}\r
-\r
-HRESULT STDMETHODCALLTYPE XcpPropertyBag::QueryInterface(REFIID iid, void** ppvObject)\r
-{\r
-       return S_OK;\r
-}\r
-\r
-ULONG STDMETHODCALLTYPE XcpPropertyBag::AddRef(void)\r
-{\r
-       return InterlockedIncrement((LONG*)&m_RefCount);\r
-}\r
-\r
-ULONG STDMETHODCALLTYPE XcpPropertyBag::Release(void)\r
-{\r
-       int             newRefValue;\r
-       \r
-       newRefValue = InterlockedDecrement((LONG*)&m_RefCount);\r
-       if (newRefValue == 0)\r
-       {\r
-               delete this;\r
-               return 0;\r
-       }\r
-       \r
-       return newRefValue;\r
-}\r
-\r
-STDMETHODIMP XcpPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog)\r
-{\r
-       HRESULT hr = E_INVALIDARG;\r
-       BSTR bstrValue = NULL;\r
-         \r
-       if (_wcsicmp(pszPropName, L"Source") == 0) \r
-       {\r
-               bstrValue = SysAllocString(L"SilverlightBalls.xap");\r
-       }    \r
-       else if (_wcsicmp(pszPropName, L"Background") == 0) \r
-       {\r
-               bstrValue = SysAllocString(L"Transparent");\r
-       }\r
-       else if (_wcsicmp(pszPropName, L"EnableGPUAcceleration") == 0) \r
-       {\r
-               V_VT(pVar) = VT_BOOL;\r
-               V_BOOL(pVar) = VARIANT_TRUE;\r
-               hr = S_OK;\r
-       }\r
-\r
-       else if (_wcsicmp(pszPropName, L"Windowless") == 0) \r
-       {\r
-               V_VT(pVar) = VT_BOOL;\r
-               V_BOOL(pVar) = VARIANT_FALSE;\r
-               hr = S_OK;\r
-       }\r
-\r
-       if (bstrValue != NULL) \r
-       {\r
-               V_VT(pVar) = VT_BSTR;\r
-               V_BSTR(pVar) = bstrValue;\r
-               hr = S_OK;\r
-       }\r
-       return hr;\r
-}\r
-\r
-       \r
-STDMETHODIMP XcpPropertyBag::Write(LPCOLESTR pszPropName, VARIANT *pVar)\r
-{\r
-       return S_OK;\r
-}
\ No newline at end of file

diff --git a/modules/silverlight/interop/XcpPropertyBag.h b/modules/silverlight/interop/XcpPropertyBag.h
deleted file mode 100644 (file)
index 6026029..0000000
--- a/modules/silverlight/interop/XcpPropertyBag.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once\r
-\r
-#include "Ocidl.h"\r
-#include "xcpctrl_h.h"\r
-\r
-#include "atlstr.h"\r
-\r
-using namespace ATL;\r
-\r
-class XcpPropertyBag : public IPropertyBag\r
-{\r
-       int m_RefCount;\r
-public:\r
-       XcpPropertyBag();\r
-       ~XcpPropertyBag();\r
-\r
-       HRESULT _stdcall QueryInterface(REFIID iid, void** ppvObject);\r
-       ULONG _stdcall AddRef();        \r
-       ULONG _stdcall Release();\r
-\r
-       STDMETHOD (Read)(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog);   \r
-       STDMETHOD (Write)(LPCOLESTR pszPropName, VARIANT *pVar);\r
-};
\ No newline at end of file

diff --git a/modules/silverlight/interop/xcpctrl.h b/modules/silverlight/interop/xcpctrl.h
deleted file mode 100644 (file)
index 8b12518..0000000
--- a/modules/silverlight/interop/xcpctrl.h
+++ /dev/null
@@ -1,1366 +0,0 @@
-\r
-\r
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */\r
-\r
-\r
- /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Jan 22 19:48:54 2011\r
- */\r
-/* Compiler settings for xcpctrl.idl:\r
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
-    protocol : dce , ms_ext, c_ext, robust\r
-    error checks: allocation ref bounds_check enum stub_data \r
-    VC __declspec() decoration level: \r
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)\r
-         DECLSPEC_UUID(), MIDL_INTERFACE()\r
-*/\r
-/* @@MIDL_FILE_HEADING(  ) */\r
-\r
-#pragma warning( disable: 4049 )  /* more than 64k source lines */\r
-\r
-\r
-/* verify that the <rpcndr.h> version is high enough to compile this file*/\r
-#ifndef __REQUIRED_RPCNDR_H_VERSION__\r
-#define __REQUIRED_RPCNDR_H_VERSION__ 475\r
-#endif\r
-\r
-#include "rpc.h"\r
-#include "rpcndr.h"\r
-\r
-#ifndef __RPCNDR_H_VERSION__\r
-#error this stub requires an updated version of <rpcndr.h>\r
-#endif // __RPCNDR_H_VERSION__\r
-\r
-#ifndef COM_NO_WINDOWS_H\r
-#include "windows.h"\r
-#include "ole2.h"\r
-#endif /*COM_NO_WINDOWS_H*/\r
-\r
-#ifndef __xcpctrl_h__\r
-#define __xcpctrl_h__\r
-\r
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)\r
-#pragma once\r
-#endif\r
-\r
-/* Forward Declarations */ \r
-\r
-#ifndef __IXcpObject_FWD_DEFINED__\r
-#define __IXcpObject_FWD_DEFINED__\r
-typedef interface IXcpObject IXcpObject;\r
-#endif         /* __IXcpObject_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl_FWD_DEFINED__\r
-#define __IXcpControl_FWD_DEFINED__\r
-typedef interface IXcpControl IXcpControl;\r
-#endif         /* __IXcpControl_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl2_FWD_DEFINED__\r
-#define __IXcpControl2_FWD_DEFINED__\r
-typedef interface IXcpControl2 IXcpControl2;\r
-#endif         /* __IXcpControl2_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlDownloadCallback_FWD_DEFINED__\r
-#define __IXcpControlDownloadCallback_FWD_DEFINED__\r
-typedef interface IXcpControlDownloadCallback IXcpControlDownloadCallback;\r
-#endif         /* __IXcpControlDownloadCallback_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost_FWD_DEFINED__\r
-#define __IXcpControlHost_FWD_DEFINED__\r
-typedef interface IXcpControlHost IXcpControlHost;\r
-#endif         /* __IXcpControlHost_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost2_FWD_DEFINED__\r
-#define __IXcpControlHost2_FWD_DEFINED__\r
-typedef interface IXcpControlHost2 IXcpControlHost2;\r
-#endif         /* __IXcpControlHost2_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost3_FWD_DEFINED__\r
-#define __IXcpControlHost3_FWD_DEFINED__\r
-typedef interface IXcpControlHost3 IXcpControlHost3;\r
-#endif         /* __IXcpControlHost3_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __XcpControl_FWD_DEFINED__\r
-#define __XcpControl_FWD_DEFINED__\r
-\r
-#ifdef __cplusplus\r
-typedef class XcpControl XcpControl;\r
-#else\r
-typedef struct XcpControl XcpControl;\r
-#endif /* __cplusplus */\r
-\r
-#endif         /* __XcpControl_FWD_DEFINED__ */\r
-\r
-\r
-/* header files for imported files */\r
-#include "oaidl.h"\r
-#include "ocidl.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C"{\r
-#endif \r
-\r
-\r
-#ifndef __IXcpObject_INTERFACE_DEFINED__\r
-#define __IXcpObject_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpObject */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpObject;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("EE38D0F1-5AE3-408c-A6BF-8410E645F376")\r
-    IXcpObject : public IDispatch\r
-    {\r
-    public:\r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpObjectVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpObject * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpObject * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpObject * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpObject * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpObject * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpObject * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpObject * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        END_INTERFACE\r
-    } IXcpObjectVtbl;\r
-\r
-    interface IXcpObject\r
-    {\r
-        CONST_VTBL struct IXcpObjectVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpObject_QueryInterface(This,riid,ppvObject) \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpObject_AddRef(This)        \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpObject_Release(This)       \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpObject_GetTypeInfoCount(This,pctinfo)      \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpObject_GetTypeInfo(This,iTInfo,lcid,ppTInfo)       \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpObject_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)     \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpObject_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)       \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpObject_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl_INTERFACE_DEFINED__\r
-#define __IXcpControl_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControl */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControl;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1FB839CC-116C-4C9B-AE8E-3DBB6496E326")\r
-    IXcpControl : public IDispatch\r
-    {\r
-    public:\r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Source( \r
-            /* [retval][out] */ BSTR *pstr) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_Source( \r
-            /* [in] */ BSTR str) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_IsLoaded( \r
-            /* [retval][out] */ VARIANT_BOOL *pb) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Content( \r
-            /* [retval][out] */ IDispatch **ppContent) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Settings( \r
-            /* [retval][out] */ IDispatch **ppSettings) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnLoad( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnLoad( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnError( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnError( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE CreateObject( \r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE IsVersionSupported( \r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_InitParams( \r
-            /* [retval][out] */ BSTR *initparams) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_InitParams( \r
-            /* [in] */ BSTR initparams) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControl * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControl * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControl * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpControl * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpControl * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpControl * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpControl * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Source )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Source )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_IsLoaded )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Content )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ IDispatch **ppContent);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Settings )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ IDispatch **ppSettings);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnLoad )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnLoad )( \r
-            IXcpControl * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnError )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnError )( \r
-            IXcpControl * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *CreateObject )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *IsVersionSupported )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_InitParams )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ BSTR *initparams);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_InitParams )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR initparams);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlVtbl;\r
-\r
-    interface IXcpControl\r
-    {\r
-        CONST_VTBL struct IXcpControlVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControl_QueryInterface(This,riid,ppvObject)        \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControl_AddRef(This)       \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControl_Release(This)      \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControl_GetTypeInfoCount(This,pctinfo)     \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpControl_GetTypeInfo(This,iTInfo,lcid,ppTInfo)      \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpControl_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)    \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpControl_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)      \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#define IXcpControl_get_Source(This,pstr)      \\r
-    ( (This)->lpVtbl -> get_Source(This,pstr) ) \r
-\r
-#define IXcpControl_put_Source(This,str)       \\r
-    ( (This)->lpVtbl -> put_Source(This,str) ) \r
-\r
-#define IXcpControl_get_IsLoaded(This,pb)      \\r
-    ( (This)->lpVtbl -> get_IsLoaded(This,pb) ) \r
-\r
-#define IXcpControl_get_Content(This,ppContent)        \\r
-    ( (This)->lpVtbl -> get_Content(This,ppContent) ) \r
-\r
-#define IXcpControl_get_Settings(This,ppSettings)      \\r
-    ( (This)->lpVtbl -> get_Settings(This,ppSettings) ) \r
-\r
-#define IXcpControl_get_OnLoad(This,pVAR)      \\r
-    ( (This)->lpVtbl -> get_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl_put_OnLoad(This,pVAR)      \\r
-    ( (This)->lpVtbl -> put_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl_get_OnError(This,pVAR)     \\r
-    ( (This)->lpVtbl -> get_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl_put_OnError(This,pVAR)     \\r
-    ( (This)->lpVtbl -> put_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl_CreateObject(This,id,ppDisp)       \\r
-    ( (This)->lpVtbl -> CreateObject(This,id,ppDisp) ) \r
-\r
-#define IXcpControl_IsVersionSupported(This,v,pb)      \\r
-    ( (This)->lpVtbl -> IsVersionSupported(This,v,pb) ) \r
-\r
-#define IXcpControl_get_InitParams(This,initparams)    \\r
-    ( (This)->lpVtbl -> get_InitParams(This,initparams) ) \r
-\r
-#define IXcpControl_put_InitParams(This,initparams)    \\r
-    ( (This)->lpVtbl -> put_InitParams(This,initparams) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControl_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl2_INTERFACE_DEFINED__\r
-#define __IXcpControl2_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControl2 */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControl2;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1c3294f9-891f-49b1-bbae-492a68ba10cc")\r
-    IXcpControl2 : public IXcpControl\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE LoadRuntime( void) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_SplashScreenSource( \r
-            /* [retval][out] */ BSTR *pstr) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_SplashScreenSource( \r
-            /* [in] */ BSTR str) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnSourceDownloadComplete( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnSourceDownloadComplete( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnSourceDownloadProgressChanged( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnSourceDownloadProgressChanged( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControl2Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControl2 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControl2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpControl2 * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Source )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Source )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_IsLoaded )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Content )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ IDispatch **ppContent);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Settings )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ IDispatch **ppSettings);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnLoad )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnLoad )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnError )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnError )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *CreateObject )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *IsVersionSupported )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_InitParams )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *initparams);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_InitParams )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR initparams);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *LoadRuntime )( \r
-            IXcpControl2 * This);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_SplashScreenSource )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_SplashScreenSource )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnSourceDownloadComplete )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnSourceDownloadComplete )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnSourceDownloadProgressChanged )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnSourceDownloadProgressChanged )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControl2Vtbl;\r
-\r
-    interface IXcpControl2\r
-    {\r
-        CONST_VTBL struct IXcpControl2Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControl2_QueryInterface(This,riid,ppvObject)       \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControl2_AddRef(This)      \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControl2_Release(This)     \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControl2_GetTypeInfoCount(This,pctinfo)    \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpControl2_GetTypeInfo(This,iTInfo,lcid,ppTInfo)     \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpControl2_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)   \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpControl2_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)     \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#define IXcpControl2_get_Source(This,pstr)     \\r
-    ( (This)->lpVtbl -> get_Source(This,pstr) ) \r
-\r
-#define IXcpControl2_put_Source(This,str)      \\r
-    ( (This)->lpVtbl -> put_Source(This,str) ) \r
-\r
-#define IXcpControl2_get_IsLoaded(This,pb)     \\r
-    ( (This)->lpVtbl -> get_IsLoaded(This,pb) ) \r
-\r
-#define IXcpControl2_get_Content(This,ppContent)       \\r
-    ( (This)->lpVtbl -> get_Content(This,ppContent) ) \r
-\r
-#define IXcpControl2_get_Settings(This,ppSettings)     \\r
-    ( (This)->lpVtbl -> get_Settings(This,ppSettings) ) \r
-\r
-#define IXcpControl2_get_OnLoad(This,pVAR)     \\r
-    ( (This)->lpVtbl -> get_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnLoad(This,pVAR)     \\r
-    ( (This)->lpVtbl -> put_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl2_get_OnError(This,pVAR)    \\r
-    ( (This)->lpVtbl -> get_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnError(This,pVAR)    \\r
-    ( (This)->lpVtbl -> put_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl2_CreateObject(This,id,ppDisp)      \\r
-    ( (This)->lpVtbl -> CreateObject(This,id,ppDisp) ) \r
-\r
-#define IXcpControl2_IsVersionSupported(This,v,pb)     \\r
-    ( (This)->lpVtbl -> IsVersionSupported(This,v,pb) ) \r
-\r
-#define IXcpControl2_get_InitParams(This,initparams)   \\r
-    ( (This)->lpVtbl -> get_InitParams(This,initparams) ) \r
-\r
-#define IXcpControl2_put_InitParams(This,initparams)   \\r
-    ( (This)->lpVtbl -> put_InitParams(This,initparams) ) \r
-\r
-\r
-#define IXcpControl2_LoadRuntime(This) \\r
-    ( (This)->lpVtbl -> LoadRuntime(This) ) \r
-\r
-#define IXcpControl2_get_SplashScreenSource(This,pstr) \\r
-    ( (This)->lpVtbl -> get_SplashScreenSource(This,pstr) ) \r
-\r
-#define IXcpControl2_put_SplashScreenSource(This,str)  \\r
-    ( (This)->lpVtbl -> put_SplashScreenSource(This,str) ) \r
-\r
-#define IXcpControl2_get_OnSourceDownloadComplete(This,pVAR)   \\r
-    ( (This)->lpVtbl -> get_OnSourceDownloadComplete(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnSourceDownloadComplete(This,pVAR)   \\r
-    ( (This)->lpVtbl -> put_OnSourceDownloadComplete(This,pVAR) ) \r
-\r
-#define IXcpControl2_get_OnSourceDownloadProgressChanged(This,pVAR)    \\r
-    ( (This)->lpVtbl -> get_OnSourceDownloadProgressChanged(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnSourceDownloadProgressChanged(This,pVAR)    \\r
-    ( (This)->lpVtbl -> put_OnSourceDownloadProgressChanged(This,pVAR) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControl2_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlDownloadCallback_INTERFACE_DEFINED__\r
-#define __IXcpControlDownloadCallback_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlDownloadCallback */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlDownloadCallback;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("2E340632-5D5A-427b-AC31-303F6E32B9E8")\r
-    IXcpControlDownloadCallback : public IUnknown\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE OnUrlDownloaded( \r
-            HRESULT hr,\r
-            IStream *pStream) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlDownloadCallbackVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlDownloadCallback * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlDownloadCallback * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlDownloadCallback * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *OnUrlDownloaded )( \r
-            IXcpControlDownloadCallback * This,\r
-            HRESULT hr,\r
-            IStream *pStream);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlDownloadCallbackVtbl;\r
-\r
-    interface IXcpControlDownloadCallback\r
-    {\r
-        CONST_VTBL struct IXcpControlDownloadCallbackVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlDownloadCallback_QueryInterface(This,riid,ppvObject)        \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlDownloadCallback_AddRef(This)       \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlDownloadCallback_Release(This)      \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlDownloadCallback_OnUrlDownloaded(This,hr,pStream)   \\r
-    ( (This)->lpVtbl -> OnUrlDownloaded(This,hr,pStream) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlDownloadCallback_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost_INTERFACE_DEFINED__\r
-#define __IXcpControlHost_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-typedef /* [public] */ \r
-enum __MIDL_IXcpControlHost_0001\r
-    {  XcpHostOption_FreezeOnInitialFrame      = 0x1,\r
-       XcpHostOption_DisableFullScreen = 0x2,\r
-       XcpHostOption_DisableManagedExecution   = 0x8,\r
-       XcpHostOption_EnableCrossDomainDownloads        = 0x10,\r
-       XcpHostOption_UseCustomAppDomain        = 0x20,\r
-       XcpHostOption_DisableNetworking = 0x40,\r
-       XcpHostOption_DisableScriptCallouts     = 0x80,\r
-       XcpHostOption_EnableHtmlDomAccess       = 0x100,\r
-       XcpHostOption_EnableScriptableObjectAccess      = 0x200,\r
-       XcpHostOption_EnableAssemblySharing     = 0x800,\r
-       XcpHostOption_HookGetComAutomationObject        = 0x1000,\r
-       XcpHostOption_EnableElevatedPermissions = 0x2000,\r
-       XcpHostOption_EnableWindowlessAccessibility     = 0x4000\r
-    }  XcpHostOptions;\r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1B36028E-B491-4bb2-8584-8A9E0A677D6E")\r
-    IXcpControlHost : public IUnknown\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetHostOptions( \r
-            /* [retval][out] */ DWORD *pdwOptions) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE NotifyLoaded( void) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE NotifyError( \r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE InvokeHandler( \r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetBaseUrl( \r
-            /* [retval][out] */ BSTR *pbstrUrl) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetNamedSource( \r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE DownloadUrl( \r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHostVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHostVtbl;\r
-\r
-    interface IXcpControlHost\r
-    {\r
-        CONST_VTBL struct IXcpControlHostVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost_QueryInterface(This,riid,ppvObject)    \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost_AddRef(This)   \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost_Release(This)  \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost_GetHostOptions(This,pdwOptions)        \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost_NotifyLoaded(This)     \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost_NotifyError(This,bstrError,bstrSource,nLine,nColumn)   \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)        \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost_GetBaseUrl(This,pbstrUrl)      \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost_GetNamedSource(This,bstrSourceName,pbstrSource)        \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost_DownloadUrl(This,bstrUrl,pCallback,ppStream)   \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost2_INTERFACE_DEFINED__\r
-#define __IXcpControlHost2_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost2 */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost2;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("fb3ed7c4-5797-4b44-8695-0c512ea27d8f")\r
-    IXcpControlHost2 : public IXcpControlHost\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetCustomAppDomain( \r
-            /* [retval][out] */ IUnknown **ppAppDomain) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetControlVersion( \r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHost2Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetCustomAppDomain )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ IUnknown **ppAppDomain);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetControlVersion )( \r
-            IXcpControlHost2 * This,\r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHost2Vtbl;\r
-\r
-    interface IXcpControlHost2\r
-    {\r
-        CONST_VTBL struct IXcpControlHost2Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost2_QueryInterface(This,riid,ppvObject)   \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost2_AddRef(This)  \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost2_Release(This) \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost2_GetHostOptions(This,pdwOptions)       \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost2_NotifyLoaded(This)    \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost2_NotifyError(This,bstrError,bstrSource,nLine,nColumn)  \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost2_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)       \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost2_GetBaseUrl(This,pbstrUrl)     \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost2_GetNamedSource(This,bstrSourceName,pbstrSource)       \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost2_DownloadUrl(This,bstrUrl,pCallback,ppStream)  \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-\r
-#define IXcpControlHost2_GetCustomAppDomain(This,ppAppDomain)  \\r
-    ( (This)->lpVtbl -> GetCustomAppDomain(This,ppAppDomain) ) \r
-\r
-#define IXcpControlHost2_GetControlVersion(This,puMajorVersion,puMinorVersion) \\r
-    ( (This)->lpVtbl -> GetControlVersion(This,puMajorVersion,puMinorVersion) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost2_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost3_INTERFACE_DEFINED__\r
-#define __IXcpControlHost3_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost3 */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-typedef /* [public] */ \r
-enum __MIDL_IXcpControlHost3_0001\r
-    {  XcpHost_GetComAutomationObjectFlag_Get  = 0x1,\r
-       XcpHost_GetComAutomationObjectFlag_Create       = 0x2\r
-    }  XcpHost_GetComAutomationObjectFlags;\r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost3;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("9fb2ce5f-06ff-4058-befa-ddfab596b3d5")\r
-    IXcpControlHost3 : public IXcpControlHost2\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetDefaultThemeXaml( \r
-            /* [in] */ BSTR assemblyName,\r
-            /* [retval][out] */ LPBSTR pbstrXaml) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetDefaultPortableUserInterfaceFontInfo( \r
-            /* [retval][out] */ LPBSTR pbstrCompositeFont) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetComAutomationObject( \r
-            /* [in] */ BSTR bstrProgId,\r
-            /* [in] */ DWORD dwFlags,\r
-            /* [retval][out] */ IDispatch **ppDisp) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHost3Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetCustomAppDomain )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ IUnknown **ppAppDomain);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetControlVersion )( \r
-            IXcpControlHost3 * This,\r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetDefaultThemeXaml )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR assemblyName,\r
-            /* [retval][out] */ LPBSTR pbstrXaml);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetDefaultPortableUserInterfaceFontInfo )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ LPBSTR pbstrCompositeFont);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetComAutomationObject )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrProgId,\r
-            /* [in] */ DWORD dwFlags,\r
-            /* [retval][out] */ IDispatch **ppDisp);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHost3Vtbl;\r
-\r
-    interface IXcpControlHost3\r
-    {\r
-        CONST_VTBL struct IXcpControlHost3Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost3_QueryInterface(This,riid,ppvObject)   \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost3_AddRef(This)  \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost3_Release(This) \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost3_GetHostOptions(This,pdwOptions)       \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost3_NotifyLoaded(This)    \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost3_NotifyError(This,bstrError,bstrSource,nLine,nColumn)  \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost3_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)       \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost3_GetBaseUrl(This,pbstrUrl)     \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost3_GetNamedSource(This,bstrSourceName,pbstrSource)       \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost3_DownloadUrl(This,bstrUrl,pCallback,ppStream)  \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-\r
-#define IXcpControlHost3_GetCustomAppDomain(This,ppAppDomain)  \\r
-    ( (This)->lpVtbl -> GetCustomAppDomain(This,ppAppDomain) ) \r
-\r
-#define IXcpControlHost3_GetControlVersion(This,puMajorVersion,puMinorVersion) \\r
-    ( (This)->lpVtbl -> GetControlVersion(This,puMajorVersion,puMinorVersion) ) \r
-\r
-\r
-#define IXcpControlHost3_GetDefaultThemeXaml(This,assemblyName,pbstrXaml)      \\r
-    ( (This)->lpVtbl -> GetDefaultThemeXaml(This,assemblyName,pbstrXaml) ) \r
-\r
-#define IXcpControlHost3_GetDefaultPortableUserInterfaceFontInfo(This,pbstrCompositeFont)      \\r
-    ( (This)->lpVtbl -> GetDefaultPortableUserInterfaceFontInfo(This,pbstrCompositeFont) ) \r
-\r
-#define IXcpControlHost3_GetComAutomationObject(This,bstrProgId,dwFlags,ppDisp)        \\r
-    ( (This)->lpVtbl -> GetComAutomationObject(This,bstrProgId,dwFlags,ppDisp) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost3_INTERFACE_DEFINED__ */\r
-\r
-\r
-\r
-#ifndef __XcpControlLib_LIBRARY_DEFINED__\r
-#define __XcpControlLib_LIBRARY_DEFINED__\r
-\r
-/* library XcpControlLib */\r
-/* [control][helpstring][version][uuid] */ \r
-\r
-\r
-EXTERN_C const IID LIBID_XcpControlLib;\r
-\r
-EXTERN_C const CLSID CLSID_XcpControl;\r
-\r
-#ifdef __cplusplus\r
-\r
-class DECLSPEC_UUID("DFEAF541-F3E1-4c24-ACAC-99C30715084A")\r
-XcpControl;\r
-#endif\r
-#endif /* __XcpControlLib_LIBRARY_DEFINED__ */\r
-\r
-/* Additional Prototypes for ALL interfaces */\r
-\r
-unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); \r
-unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); \r
-unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); \r
-void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); \r
-\r
-unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * ); \r
-unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * ); \r
-unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); \r
-void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * ); \r
-\r
-/* end of Additional Prototypes */\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-\r
-\r

diff --git a/modules/silverlight/interop/xcpctrl.idl b/modules/silverlight/interop/xcpctrl.idl
deleted file mode 100644 (file)
index c3d4704..0000000
--- a/modules/silverlight/interop/xcpctrl.idl
+++ /dev/null
@@ -1,226 +0,0 @@
-//------------------------------------------------------------------------\r
-//\r
-//  Copyright (c) 2005  Microsoft Corporation\r
-//\r
-//  Abstract:\r
-//\r
-//      IDL file for activex control\r
-//\r
-//\r
-//------------------------------------------------------------------------\r
-//\r
-\r
-#include "olectl.h"\r
-import "oaidl.idl";\r
-import "ocidl.idl";\r
-\r
-[\r
-    object,\r
-    uuid(EE38D0F1-5AE3-408c-A6BF-8410E645F376),\r
-    dual,\r
-    nonextensible,\r
-    helpstring("IXcpObject Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpObject : IDispatch\r
-{\r
-};\r
-\r
-\r
-[\r
-    object,\r
-    uuid(1FB839CC-116C-4C9B-AE8E-3DBB6496E326),\r
-    dual,\r
-    nonextensible,\r
-    helpstring("IXcpControl Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControl : IDispatch\r
-{\r
-    [propget, bindable, requestedit]\r
-    HRESULT Source([out, retval]  BSTR *pstr);\r
-    [propput, bindable, requestedit]\r
-    HRESULT Source([in] BSTR str);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT IsLoaded([out, retval]  VARIANT_BOOL *pb);\r
-\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT Content([out, retval]  IDispatch **ppContent);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT Settings([out, retval]  IDispatch **ppSettings);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT OnLoad([out, retval] VARIANT* pVAR);\r
-    [propput, bindable, requestedit]\r
-    HRESULT OnLoad([in] VARIANT* pVAR);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT OnError([out, retval] VARIANT* pVAR);\r
-    [propput, bindable, requestedit]\r
-    HRESULT OnError([in] VARIANT* pVAR);\r
-\r
-    HRESULT CreateObject([in] BSTR id, [out, retval] IXcpObject** ppDisp);\r
-\r
-    HRESULT IsVersionSupported([in] BSTR v, [out, retval] VARIANT_BOOL *pb);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT InitParams([out, retval] BSTR * initparams);\r
-    [propput, bindable, requestedit]\r
-    HRESULT InitParams([in] BSTR initparams);\r
-};\r
-\r
-[\r
-    object,\r
-    uuid(1c3294f9-891f-49b1-bbae-492a68ba10cc),\r
-    dual,\r
-    nonextensible,\r
-    helpstring("IXcpControl2 Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControl2 : IXcpControl\r
-{\r
-    HRESULT LoadRuntime();\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT SplashScreenSource([out, retval]  BSTR *pstr);\r
-    [propput, bindable, requestedit]\r
-    HRESULT SplashScreenSource([in] BSTR str);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT OnSourceDownloadComplete([out, retval] VARIANT* pVAR);\r
-    [propput, bindable, requestedit]\r
-    HRESULT OnSourceDownloadComplete([in] VARIANT* pVAR);\r
-\r
-    [propget, bindable, requestedit]\r
-    HRESULT OnSourceDownloadProgressChanged([out, retval] VARIANT* pVAR);\r
-    [propput, bindable, requestedit]\r
-    HRESULT OnSourceDownloadProgressChanged([in] VARIANT* pVAR);\r
-};\r
-\r
-[\r
-    object,\r
-    uuid(2E340632-5D5A-427b-AC31-303F6E32B9E8),\r
-    nonextensible,\r
-    helpstring("IXcpControlDownloadCallback Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControlDownloadCallback : IUnknown\r
-{\r
-    HRESULT OnUrlDownloaded(HRESULT hr, IStream* pStream);\r
-};\r
-\r
-[\r
-    object,\r
-    uuid(1B36028E-B491-4bb2-8584-8A9E0A677D6E),\r
-    nonextensible,\r
-    helpstring("IXcpControlHost Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControlHost : IUnknown\r
-{\r
-    typedef enum\r
-    {\r
-        XcpHostOption_FreezeOnInitialFrame         = 0x001,\r
-        XcpHostOption_DisableFullScreen            = 0x002,\r
-        XcpHostOption_DisableManagedExecution      = 0x008,\r
-        XcpHostOption_EnableCrossDomainDownloads   = 0x010,\r
-        XcpHostOption_UseCustomAppDomain           = 0x020,\r
-        XcpHostOption_DisableNetworking            = 0x040,        \r
-        XcpHostOption_DisableScriptCallouts        = 0x080,\r
-        XcpHostOption_EnableHtmlDomAccess          = 0x100,\r
-        XcpHostOption_EnableScriptableObjectAccess = 0x200,\r
-        // Skipping a number so as not to conflict with mobile.\r
-        XcpHostOption_EnableAssemblySharing        = 0x800,\r
-        XcpHostOption_HookGetComAutomationObject   = 0x1000,\r
-        XcpHostOption_EnableElevatedPermissions    = 0x2000,\r
-        XcpHostOption_EnableWindowlessAccessibility = 0x4000,\r
-    } XcpHostOptions;\r
-\r
-    HRESULT GetHostOptions([out, retval] DWORD* pdwOptions);\r
-\r
-    HRESULT NotifyLoaded();\r
-\r
-    HRESULT NotifyError([in] BSTR bstrError, [in] BSTR bstrSource, [in] long nLine, [in] long nColumn);\r
-\r
-    HRESULT InvokeHandler([in] BSTR bstrName, [in] VARIANT varArg1, [in] VARIANT varArg2, [out, retval] VARIANT* pvarResult);\r
-\r
-    HRESULT GetBaseUrl([out, retval] BSTR* pbstrUrl);\r
-\r
-    HRESULT GetNamedSource([in] BSTR bstrSourceName, [out, retval] BSTR* pbstrSource);\r
-\r
-    //\r
-    // Called by Silverlight to allow a host to provide content for a specified URI. This is useful in cases\r
-    // where a resource would normally be loaded out of a XAP at runtime. At design time, no XAP exists, and\r
-    // the host can provide content for that resource.\r
-    //\r
-    // This method can work synchronously or asynchronously. If the pCallback parameter is NULL, the host must\r
-    // do the work synchronously and return the result in ppStream. If the pCallback parameter is non-NULL, the host\r
-    // may do the work synchronously or asynchronously, invoking callback methods as defined by the \r
-    // IXcpControlDownloadCallback interface. If the host chooses to work asyncronously, the ppStream parameter is\r
-    // ignored.\r
-    //\r
-    // The host should return S_FALSE if it cannot provide a resource for the requested URI, and S_OK on a\r
-    // successful request.\r
-    //\r
-    HRESULT DownloadUrl([in] BSTR bstrUrl, [in] IXcpControlDownloadCallback* pCallback, [out, retval] IStream** ppStream);\r
-\r
-};\r
-\r
-[\r
-    object,\r
-    uuid(fb3ed7c4-5797-4b44-8695-0c512ea27d8f),\r
-    nonextensible,\r
-    helpstring("IXcpControlHost2 Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControlHost2 : IXcpControlHost\r
-{\r
-    HRESULT GetCustomAppDomain([out, retval] IUnknown** ppAppDomain);\r
-\r
-    HRESULT GetControlVersion([out] UINT *puMajorVersion, [out] UINT *puMinorVersion);\r
-};\r
-\r
-[\r
-    object,\r
-    uuid(9fb2ce5f-06ff-4058-befa-ddfab596b3d5),\r
-    nonextensible,\r
-    helpstring("IXcpControlHost3 Interface"),\r
-    pointer_default(unique)\r
-]\r
-interface IXcpControlHost3 : IXcpControlHost2\r
-{\r
-    HRESULT GetDefaultThemeXaml([in] BSTR assemblyName, [out, retval] LPBSTR pbstrXaml);\r
-    \r
-    HRESULT GetDefaultPortableUserInterfaceFontInfo([out, retval] LPBSTR pbstrCompositeFont);\r
-\r
-    typedef enum\r
-    {\r
-        XcpHost_GetComAutomationObjectFlag_Get    = 0x1,\r
-        XcpHost_GetComAutomationObjectFlag_Create = 0x2\r
-    } XcpHost_GetComAutomationObjectFlags;\r
-\r
-    HRESULT GetComAutomationObject([in] BSTR bstrProgId, [in] DWORD dwFlags, [out, retval] IDispatch** ppDisp);\r
-};\r
-\r
-[\r
-    uuid(283C8576-0726-4DBC-9609-3F855162009A),\r
-    version(4.0),\r
-    helpstring("AgControl 4.0 Type Library"),\r
-    control\r
-]\r
-library XcpControlLib\r
-{\r
-    importlib("stdole2.tlb");\r
-    [\r
-        uuid(DFEAF541-F3E1-4c24-ACAC-99C30715084A),\r
-        helpstring("AgControl Class")\r
-    ]\r
-    coclass XcpControl\r
-    {\r
-        [default] interface IXcpControl2;\r
-        interface IXcpControl;\r
-    };\r
-};\r

diff --git a/modules/silverlight/interop/xcpctrl_h.h b/modules/silverlight/interop/xcpctrl_h.h
deleted file mode 100644 (file)
index 79b6d5b..0000000
--- a/modules/silverlight/interop/xcpctrl_h.h
+++ /dev/null
@@ -1,1366 +0,0 @@
-\r
-\r
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */\r
-\r
-\r
- /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Jan 22 19:55:15 2011\r
- */\r
-/* Compiler settings for xcpctrl.idl:\r
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
-    protocol : dce , ms_ext, c_ext, robust\r
-    error checks: allocation ref bounds_check enum stub_data \r
-    VC __declspec() decoration level: \r
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)\r
-         DECLSPEC_UUID(), MIDL_INTERFACE()\r
-*/\r
-/* @@MIDL_FILE_HEADING(  ) */\r
-\r
-#pragma warning( disable: 4049 )  /* more than 64k source lines */\r
-\r
-\r
-/* verify that the <rpcndr.h> version is high enough to compile this file*/\r
-#ifndef __REQUIRED_RPCNDR_H_VERSION__\r
-#define __REQUIRED_RPCNDR_H_VERSION__ 475\r
-#endif\r
-\r
-#include "rpc.h"\r
-#include "rpcndr.h"\r
-\r
-#ifndef __RPCNDR_H_VERSION__\r
-#error this stub requires an updated version of <rpcndr.h>\r
-#endif // __RPCNDR_H_VERSION__\r
-\r
-#ifndef COM_NO_WINDOWS_H\r
-#include "windows.h"\r
-#include "ole2.h"\r
-#endif /*COM_NO_WINDOWS_H*/\r
-\r
-#ifndef __xcpctrl_h_h__\r
-#define __xcpctrl_h_h__\r
-\r
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)\r
-#pragma once\r
-#endif\r
-\r
-/* Forward Declarations */ \r
-\r
-#ifndef __IXcpObject_FWD_DEFINED__\r
-#define __IXcpObject_FWD_DEFINED__\r
-typedef interface IXcpObject IXcpObject;\r
-#endif         /* __IXcpObject_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl_FWD_DEFINED__\r
-#define __IXcpControl_FWD_DEFINED__\r
-typedef interface IXcpControl IXcpControl;\r
-#endif         /* __IXcpControl_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl2_FWD_DEFINED__\r
-#define __IXcpControl2_FWD_DEFINED__\r
-typedef interface IXcpControl2 IXcpControl2;\r
-#endif         /* __IXcpControl2_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlDownloadCallback_FWD_DEFINED__\r
-#define __IXcpControlDownloadCallback_FWD_DEFINED__\r
-typedef interface IXcpControlDownloadCallback IXcpControlDownloadCallback;\r
-#endif         /* __IXcpControlDownloadCallback_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost_FWD_DEFINED__\r
-#define __IXcpControlHost_FWD_DEFINED__\r
-typedef interface IXcpControlHost IXcpControlHost;\r
-#endif         /* __IXcpControlHost_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost2_FWD_DEFINED__\r
-#define __IXcpControlHost2_FWD_DEFINED__\r
-typedef interface IXcpControlHost2 IXcpControlHost2;\r
-#endif         /* __IXcpControlHost2_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost3_FWD_DEFINED__\r
-#define __IXcpControlHost3_FWD_DEFINED__\r
-typedef interface IXcpControlHost3 IXcpControlHost3;\r
-#endif         /* __IXcpControlHost3_FWD_DEFINED__ */\r
-\r
-\r
-#ifndef __XcpControl_FWD_DEFINED__\r
-#define __XcpControl_FWD_DEFINED__\r
-\r
-#ifdef __cplusplus\r
-typedef class XcpControl XcpControl;\r
-#else\r
-typedef struct XcpControl XcpControl;\r
-#endif /* __cplusplus */\r
-\r
-#endif         /* __XcpControl_FWD_DEFINED__ */\r
-\r
-\r
-/* header files for imported files */\r
-#include "oaidl.h"\r
-#include "ocidl.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C"{\r
-#endif \r
-\r
-\r
-#ifndef __IXcpObject_INTERFACE_DEFINED__\r
-#define __IXcpObject_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpObject */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpObject;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("EE38D0F1-5AE3-408c-A6BF-8410E645F376")\r
-    IXcpObject : public IDispatch\r
-    {\r
-    public:\r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpObjectVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpObject * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpObject * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpObject * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpObject * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpObject * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpObject * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpObject * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        END_INTERFACE\r
-    } IXcpObjectVtbl;\r
-\r
-    interface IXcpObject\r
-    {\r
-        CONST_VTBL struct IXcpObjectVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpObject_QueryInterface(This,riid,ppvObject) \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpObject_AddRef(This)        \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpObject_Release(This)       \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpObject_GetTypeInfoCount(This,pctinfo)      \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpObject_GetTypeInfo(This,iTInfo,lcid,ppTInfo)       \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpObject_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)     \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpObject_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)       \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpObject_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl_INTERFACE_DEFINED__\r
-#define __IXcpControl_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControl */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControl;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1FB839CC-116C-4C9B-AE8E-3DBB6496E326")\r
-    IXcpControl : public IDispatch\r
-    {\r
-    public:\r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Source( \r
-            /* [retval][out] */ BSTR *pstr) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_Source( \r
-            /* [in] */ BSTR str) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_IsLoaded( \r
-            /* [retval][out] */ VARIANT_BOOL *pb) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Content( \r
-            /* [retval][out] */ IDispatch **ppContent) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_Settings( \r
-            /* [retval][out] */ IDispatch **ppSettings) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnLoad( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnLoad( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnError( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnError( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE CreateObject( \r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE IsVersionSupported( \r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_InitParams( \r
-            /* [retval][out] */ BSTR *initparams) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_InitParams( \r
-            /* [in] */ BSTR initparams) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControl * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControl * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControl * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpControl * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpControl * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpControl * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpControl * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Source )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Source )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_IsLoaded )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Content )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ IDispatch **ppContent);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Settings )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ IDispatch **ppSettings);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnLoad )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnLoad )( \r
-            IXcpControl * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnError )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnError )( \r
-            IXcpControl * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *CreateObject )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *IsVersionSupported )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_InitParams )( \r
-            IXcpControl * This,\r
-            /* [retval][out] */ BSTR *initparams);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_InitParams )( \r
-            IXcpControl * This,\r
-            /* [in] */ BSTR initparams);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlVtbl;\r
-\r
-    interface IXcpControl\r
-    {\r
-        CONST_VTBL struct IXcpControlVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControl_QueryInterface(This,riid,ppvObject)        \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControl_AddRef(This)       \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControl_Release(This)      \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControl_GetTypeInfoCount(This,pctinfo)     \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpControl_GetTypeInfo(This,iTInfo,lcid,ppTInfo)      \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpControl_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)    \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpControl_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)      \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#define IXcpControl_get_Source(This,pstr)      \\r
-    ( (This)->lpVtbl -> get_Source(This,pstr) ) \r
-\r
-#define IXcpControl_put_Source(This,str)       \\r
-    ( (This)->lpVtbl -> put_Source(This,str) ) \r
-\r
-#define IXcpControl_get_IsLoaded(This,pb)      \\r
-    ( (This)->lpVtbl -> get_IsLoaded(This,pb) ) \r
-\r
-#define IXcpControl_get_Content(This,ppContent)        \\r
-    ( (This)->lpVtbl -> get_Content(This,ppContent) ) \r
-\r
-#define IXcpControl_get_Settings(This,ppSettings)      \\r
-    ( (This)->lpVtbl -> get_Settings(This,ppSettings) ) \r
-\r
-#define IXcpControl_get_OnLoad(This,pVAR)      \\r
-    ( (This)->lpVtbl -> get_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl_put_OnLoad(This,pVAR)      \\r
-    ( (This)->lpVtbl -> put_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl_get_OnError(This,pVAR)     \\r
-    ( (This)->lpVtbl -> get_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl_put_OnError(This,pVAR)     \\r
-    ( (This)->lpVtbl -> put_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl_CreateObject(This,id,ppDisp)       \\r
-    ( (This)->lpVtbl -> CreateObject(This,id,ppDisp) ) \r
-\r
-#define IXcpControl_IsVersionSupported(This,v,pb)      \\r
-    ( (This)->lpVtbl -> IsVersionSupported(This,v,pb) ) \r
-\r
-#define IXcpControl_get_InitParams(This,initparams)    \\r
-    ( (This)->lpVtbl -> get_InitParams(This,initparams) ) \r
-\r
-#define IXcpControl_put_InitParams(This,initparams)    \\r
-    ( (This)->lpVtbl -> put_InitParams(This,initparams) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControl_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControl2_INTERFACE_DEFINED__\r
-#define __IXcpControl2_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControl2 */\r
-/* [unique][helpstring][nonextensible][dual][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControl2;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1c3294f9-891f-49b1-bbae-492a68ba10cc")\r
-    IXcpControl2 : public IXcpControl\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE LoadRuntime( void) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_SplashScreenSource( \r
-            /* [retval][out] */ BSTR *pstr) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_SplashScreenSource( \r
-            /* [in] */ BSTR str) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnSourceDownloadComplete( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnSourceDownloadComplete( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propget] */ HRESULT STDMETHODCALLTYPE get_OnSourceDownloadProgressChanged( \r
-            /* [retval][out] */ VARIANT *pVAR) = 0;\r
-        \r
-        virtual /* [requestedit][bindable][propput] */ HRESULT STDMETHODCALLTYPE put_OnSourceDownloadProgressChanged( \r
-            /* [in] */ VARIANT *pVAR) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControl2Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControl2 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControl2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( \r
-            IXcpControl2 * This,\r
-            /* [out] */ UINT *pctinfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ UINT iTInfo,\r
-            /* [in] */ LCID lcid,\r
-            /* [out] */ ITypeInfo **ppTInfo);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [size_is][in] */ LPOLESTR *rgszNames,\r
-            /* [range][in] */ UINT cNames,\r
-            /* [in] */ LCID lcid,\r
-            /* [size_is][out] */ DISPID *rgDispId);\r
-        \r
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ DISPID dispIdMember,\r
-            /* [in] */ REFIID riid,\r
-            /* [in] */ LCID lcid,\r
-            /* [in] */ WORD wFlags,\r
-            /* [out][in] */ DISPPARAMS *pDispParams,\r
-            /* [out] */ VARIANT *pVarResult,\r
-            /* [out] */ EXCEPINFO *pExcepInfo,\r
-            /* [out] */ UINT *puArgErr);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Source )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Source )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_IsLoaded )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Content )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ IDispatch **ppContent);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Settings )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ IDispatch **ppSettings);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnLoad )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnLoad )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnError )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnError )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *CreateObject )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR id,\r
-            /* [retval][out] */ IXcpObject **ppDisp);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *IsVersionSupported )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR v,\r
-            /* [retval][out] */ VARIANT_BOOL *pb);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_InitParams )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *initparams);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_InitParams )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR initparams);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *LoadRuntime )( \r
-            IXcpControl2 * This);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_SplashScreenSource )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ BSTR *pstr);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_SplashScreenSource )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ BSTR str);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnSourceDownloadComplete )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnSourceDownloadComplete )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propget] */ HRESULT ( STDMETHODCALLTYPE *get_OnSourceDownloadProgressChanged )( \r
-            IXcpControl2 * This,\r
-            /* [retval][out] */ VARIANT *pVAR);\r
-        \r
-        /* [requestedit][bindable][propput] */ HRESULT ( STDMETHODCALLTYPE *put_OnSourceDownloadProgressChanged )( \r
-            IXcpControl2 * This,\r
-            /* [in] */ VARIANT *pVAR);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControl2Vtbl;\r
-\r
-    interface IXcpControl2\r
-    {\r
-        CONST_VTBL struct IXcpControl2Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControl2_QueryInterface(This,riid,ppvObject)       \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControl2_AddRef(This)      \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControl2_Release(This)     \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControl2_GetTypeInfoCount(This,pctinfo)    \\r
-    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) \r
-\r
-#define IXcpControl2_GetTypeInfo(This,iTInfo,lcid,ppTInfo)     \\r
-    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) \r
-\r
-#define IXcpControl2_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)   \\r
-    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) \r
-\r
-#define IXcpControl2_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)     \\r
-    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) \r
-\r
-\r
-#define IXcpControl2_get_Source(This,pstr)     \\r
-    ( (This)->lpVtbl -> get_Source(This,pstr) ) \r
-\r
-#define IXcpControl2_put_Source(This,str)      \\r
-    ( (This)->lpVtbl -> put_Source(This,str) ) \r
-\r
-#define IXcpControl2_get_IsLoaded(This,pb)     \\r
-    ( (This)->lpVtbl -> get_IsLoaded(This,pb) ) \r
-\r
-#define IXcpControl2_get_Content(This,ppContent)       \\r
-    ( (This)->lpVtbl -> get_Content(This,ppContent) ) \r
-\r
-#define IXcpControl2_get_Settings(This,ppSettings)     \\r
-    ( (This)->lpVtbl -> get_Settings(This,ppSettings) ) \r
-\r
-#define IXcpControl2_get_OnLoad(This,pVAR)     \\r
-    ( (This)->lpVtbl -> get_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnLoad(This,pVAR)     \\r
-    ( (This)->lpVtbl -> put_OnLoad(This,pVAR) ) \r
-\r
-#define IXcpControl2_get_OnError(This,pVAR)    \\r
-    ( (This)->lpVtbl -> get_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnError(This,pVAR)    \\r
-    ( (This)->lpVtbl -> put_OnError(This,pVAR) ) \r
-\r
-#define IXcpControl2_CreateObject(This,id,ppDisp)      \\r
-    ( (This)->lpVtbl -> CreateObject(This,id,ppDisp) ) \r
-\r
-#define IXcpControl2_IsVersionSupported(This,v,pb)     \\r
-    ( (This)->lpVtbl -> IsVersionSupported(This,v,pb) ) \r
-\r
-#define IXcpControl2_get_InitParams(This,initparams)   \\r
-    ( (This)->lpVtbl -> get_InitParams(This,initparams) ) \r
-\r
-#define IXcpControl2_put_InitParams(This,initparams)   \\r
-    ( (This)->lpVtbl -> put_InitParams(This,initparams) ) \r
-\r
-\r
-#define IXcpControl2_LoadRuntime(This) \\r
-    ( (This)->lpVtbl -> LoadRuntime(This) ) \r
-\r
-#define IXcpControl2_get_SplashScreenSource(This,pstr) \\r
-    ( (This)->lpVtbl -> get_SplashScreenSource(This,pstr) ) \r
-\r
-#define IXcpControl2_put_SplashScreenSource(This,str)  \\r
-    ( (This)->lpVtbl -> put_SplashScreenSource(This,str) ) \r
-\r
-#define IXcpControl2_get_OnSourceDownloadComplete(This,pVAR)   \\r
-    ( (This)->lpVtbl -> get_OnSourceDownloadComplete(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnSourceDownloadComplete(This,pVAR)   \\r
-    ( (This)->lpVtbl -> put_OnSourceDownloadComplete(This,pVAR) ) \r
-\r
-#define IXcpControl2_get_OnSourceDownloadProgressChanged(This,pVAR)    \\r
-    ( (This)->lpVtbl -> get_OnSourceDownloadProgressChanged(This,pVAR) ) \r
-\r
-#define IXcpControl2_put_OnSourceDownloadProgressChanged(This,pVAR)    \\r
-    ( (This)->lpVtbl -> put_OnSourceDownloadProgressChanged(This,pVAR) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControl2_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlDownloadCallback_INTERFACE_DEFINED__\r
-#define __IXcpControlDownloadCallback_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlDownloadCallback */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlDownloadCallback;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("2E340632-5D5A-427b-AC31-303F6E32B9E8")\r
-    IXcpControlDownloadCallback : public IUnknown\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE OnUrlDownloaded( \r
-            HRESULT hr,\r
-            IStream *pStream) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlDownloadCallbackVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlDownloadCallback * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlDownloadCallback * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlDownloadCallback * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *OnUrlDownloaded )( \r
-            IXcpControlDownloadCallback * This,\r
-            HRESULT hr,\r
-            IStream *pStream);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlDownloadCallbackVtbl;\r
-\r
-    interface IXcpControlDownloadCallback\r
-    {\r
-        CONST_VTBL struct IXcpControlDownloadCallbackVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlDownloadCallback_QueryInterface(This,riid,ppvObject)        \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlDownloadCallback_AddRef(This)       \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlDownloadCallback_Release(This)      \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlDownloadCallback_OnUrlDownloaded(This,hr,pStream)   \\r
-    ( (This)->lpVtbl -> OnUrlDownloaded(This,hr,pStream) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlDownloadCallback_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost_INTERFACE_DEFINED__\r
-#define __IXcpControlHost_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-typedef /* [public] */ \r
-enum __MIDL_IXcpControlHost_0001\r
-    {  XcpHostOption_FreezeOnInitialFrame      = 0x1,\r
-       XcpHostOption_DisableFullScreen = 0x2,\r
-       XcpHostOption_DisableManagedExecution   = 0x8,\r
-       XcpHostOption_EnableCrossDomainDownloads        = 0x10,\r
-       XcpHostOption_UseCustomAppDomain        = 0x20,\r
-       XcpHostOption_DisableNetworking = 0x40,\r
-       XcpHostOption_DisableScriptCallouts     = 0x80,\r
-       XcpHostOption_EnableHtmlDomAccess       = 0x100,\r
-       XcpHostOption_EnableScriptableObjectAccess      = 0x200,\r
-       XcpHostOption_EnableAssemblySharing     = 0x800,\r
-       XcpHostOption_HookGetComAutomationObject        = 0x1000,\r
-       XcpHostOption_EnableElevatedPermissions = 0x2000,\r
-       XcpHostOption_EnableWindowlessAccessibility     = 0x4000\r
-    }  XcpHostOptions;\r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("1B36028E-B491-4bb2-8584-8A9E0A677D6E")\r
-    IXcpControlHost : public IUnknown\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetHostOptions( \r
-            /* [retval][out] */ DWORD *pdwOptions) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE NotifyLoaded( void) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE NotifyError( \r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE InvokeHandler( \r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetBaseUrl( \r
-            /* [retval][out] */ BSTR *pbstrUrl) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetNamedSource( \r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE DownloadUrl( \r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHostVtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHostVtbl;\r
-\r
-    interface IXcpControlHost\r
-    {\r
-        CONST_VTBL struct IXcpControlHostVtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost_QueryInterface(This,riid,ppvObject)    \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost_AddRef(This)   \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost_Release(This)  \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost_GetHostOptions(This,pdwOptions)        \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost_NotifyLoaded(This)     \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost_NotifyError(This,bstrError,bstrSource,nLine,nColumn)   \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)        \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost_GetBaseUrl(This,pbstrUrl)      \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost_GetNamedSource(This,bstrSourceName,pbstrSource)        \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost_DownloadUrl(This,bstrUrl,pCallback,ppStream)   \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost2_INTERFACE_DEFINED__\r
-#define __IXcpControlHost2_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost2 */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost2;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("fb3ed7c4-5797-4b44-8695-0c512ea27d8f")\r
-    IXcpControlHost2 : public IXcpControlHost\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetCustomAppDomain( \r
-            /* [retval][out] */ IUnknown **ppAppDomain) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetControlVersion( \r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHost2Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost2 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost2 * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetCustomAppDomain )( \r
-            IXcpControlHost2 * This,\r
-            /* [retval][out] */ IUnknown **ppAppDomain);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetControlVersion )( \r
-            IXcpControlHost2 * This,\r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHost2Vtbl;\r
-\r
-    interface IXcpControlHost2\r
-    {\r
-        CONST_VTBL struct IXcpControlHost2Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost2_QueryInterface(This,riid,ppvObject)   \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost2_AddRef(This)  \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost2_Release(This) \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost2_GetHostOptions(This,pdwOptions)       \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost2_NotifyLoaded(This)    \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost2_NotifyError(This,bstrError,bstrSource,nLine,nColumn)  \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost2_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)       \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost2_GetBaseUrl(This,pbstrUrl)     \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost2_GetNamedSource(This,bstrSourceName,pbstrSource)       \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost2_DownloadUrl(This,bstrUrl,pCallback,ppStream)  \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-\r
-#define IXcpControlHost2_GetCustomAppDomain(This,ppAppDomain)  \\r
-    ( (This)->lpVtbl -> GetCustomAppDomain(This,ppAppDomain) ) \r
-\r
-#define IXcpControlHost2_GetControlVersion(This,puMajorVersion,puMinorVersion) \\r
-    ( (This)->lpVtbl -> GetControlVersion(This,puMajorVersion,puMinorVersion) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost2_INTERFACE_DEFINED__ */\r
-\r
-\r
-#ifndef __IXcpControlHost3_INTERFACE_DEFINED__\r
-#define __IXcpControlHost3_INTERFACE_DEFINED__\r
-\r
-/* interface IXcpControlHost3 */\r
-/* [unique][helpstring][nonextensible][uuid][object] */ \r
-\r
-typedef /* [public] */ \r
-enum __MIDL_IXcpControlHost3_0001\r
-    {  XcpHost_GetComAutomationObjectFlag_Get  = 0x1,\r
-       XcpHost_GetComAutomationObjectFlag_Create       = 0x2\r
-    }  XcpHost_GetComAutomationObjectFlags;\r
-\r
-\r
-EXTERN_C const IID IID_IXcpControlHost3;\r
-\r
-#if defined(__cplusplus) && !defined(CINTERFACE)\r
-    \r
-    MIDL_INTERFACE("9fb2ce5f-06ff-4058-befa-ddfab596b3d5")\r
-    IXcpControlHost3 : public IXcpControlHost2\r
-    {\r
-    public:\r
-        virtual HRESULT STDMETHODCALLTYPE GetDefaultThemeXaml( \r
-            /* [in] */ BSTR assemblyName,\r
-            /* [retval][out] */ LPBSTR pbstrXaml) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetDefaultPortableUserInterfaceFontInfo( \r
-            /* [retval][out] */ LPBSTR pbstrCompositeFont) = 0;\r
-        \r
-        virtual HRESULT STDMETHODCALLTYPE GetComAutomationObject( \r
-            /* [in] */ BSTR bstrProgId,\r
-            /* [in] */ DWORD dwFlags,\r
-            /* [retval][out] */ IDispatch **ppDisp) = 0;\r
-        \r
-    };\r
-    \r
-#else  /* C style interface */\r
-\r
-    typedef struct IXcpControlHost3Vtbl\r
-    {\r
-        BEGIN_INTERFACE\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ REFIID riid,\r
-            /* [annotation][iid_is][out] */ \r
-            __RPC__deref_out  void **ppvObject);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *AddRef )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        ULONG ( STDMETHODCALLTYPE *Release )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetHostOptions )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ DWORD *pdwOptions);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyLoaded )( \r
-            IXcpControlHost3 * This);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *NotifyError )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrError,\r
-            /* [in] */ BSTR bstrSource,\r
-            /* [in] */ long nLine,\r
-            /* [in] */ long nColumn);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *InvokeHandler )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrName,\r
-            /* [in] */ VARIANT varArg1,\r
-            /* [in] */ VARIANT varArg2,\r
-            /* [retval][out] */ VARIANT *pvarResult);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetBaseUrl )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ BSTR *pbstrUrl);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetNamedSource )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrSourceName,\r
-            /* [retval][out] */ BSTR *pbstrSource);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *DownloadUrl )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrUrl,\r
-            /* [in] */ IXcpControlDownloadCallback *pCallback,\r
-            /* [retval][out] */ IStream **ppStream);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetCustomAppDomain )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ IUnknown **ppAppDomain);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetControlVersion )( \r
-            IXcpControlHost3 * This,\r
-            /* [out] */ UINT *puMajorVersion,\r
-            /* [out] */ UINT *puMinorVersion);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetDefaultThemeXaml )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR assemblyName,\r
-            /* [retval][out] */ LPBSTR pbstrXaml);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetDefaultPortableUserInterfaceFontInfo )( \r
-            IXcpControlHost3 * This,\r
-            /* [retval][out] */ LPBSTR pbstrCompositeFont);\r
-        \r
-        HRESULT ( STDMETHODCALLTYPE *GetComAutomationObject )( \r
-            IXcpControlHost3 * This,\r
-            /* [in] */ BSTR bstrProgId,\r
-            /* [in] */ DWORD dwFlags,\r
-            /* [retval][out] */ IDispatch **ppDisp);\r
-        \r
-        END_INTERFACE\r
-    } IXcpControlHost3Vtbl;\r
-\r
-    interface IXcpControlHost3\r
-    {\r
-        CONST_VTBL struct IXcpControlHost3Vtbl *lpVtbl;\r
-    };\r
-\r
-    \r
-\r
-#ifdef COBJMACROS\r
-\r
-\r
-#define IXcpControlHost3_QueryInterface(This,riid,ppvObject)   \\r
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) \r
-\r
-#define IXcpControlHost3_AddRef(This)  \\r
-    ( (This)->lpVtbl -> AddRef(This) ) \r
-\r
-#define IXcpControlHost3_Release(This) \\r
-    ( (This)->lpVtbl -> Release(This) ) \r
-\r
-\r
-#define IXcpControlHost3_GetHostOptions(This,pdwOptions)       \\r
-    ( (This)->lpVtbl -> GetHostOptions(This,pdwOptions) ) \r
-\r
-#define IXcpControlHost3_NotifyLoaded(This)    \\r
-    ( (This)->lpVtbl -> NotifyLoaded(This) ) \r
-\r
-#define IXcpControlHost3_NotifyError(This,bstrError,bstrSource,nLine,nColumn)  \\r
-    ( (This)->lpVtbl -> NotifyError(This,bstrError,bstrSource,nLine,nColumn) ) \r
-\r
-#define IXcpControlHost3_InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult)       \\r
-    ( (This)->lpVtbl -> InvokeHandler(This,bstrName,varArg1,varArg2,pvarResult) ) \r
-\r
-#define IXcpControlHost3_GetBaseUrl(This,pbstrUrl)     \\r
-    ( (This)->lpVtbl -> GetBaseUrl(This,pbstrUrl) ) \r
-\r
-#define IXcpControlHost3_GetNamedSource(This,bstrSourceName,pbstrSource)       \\r
-    ( (This)->lpVtbl -> GetNamedSource(This,bstrSourceName,pbstrSource) ) \r
-\r
-#define IXcpControlHost3_DownloadUrl(This,bstrUrl,pCallback,ppStream)  \\r
-    ( (This)->lpVtbl -> DownloadUrl(This,bstrUrl,pCallback,ppStream) ) \r
-\r
-\r
-#define IXcpControlHost3_GetCustomAppDomain(This,ppAppDomain)  \\r
-    ( (This)->lpVtbl -> GetCustomAppDomain(This,ppAppDomain) ) \r
-\r
-#define IXcpControlHost3_GetControlVersion(This,puMajorVersion,puMinorVersion) \\r
-    ( (This)->lpVtbl -> GetControlVersion(This,puMajorVersion,puMinorVersion) ) \r
-\r
-\r
-#define IXcpControlHost3_GetDefaultThemeXaml(This,assemblyName,pbstrXaml)      \\r
-    ( (This)->lpVtbl -> GetDefaultThemeXaml(This,assemblyName,pbstrXaml) ) \r
-\r
-#define IXcpControlHost3_GetDefaultPortableUserInterfaceFontInfo(This,pbstrCompositeFont)      \\r
-    ( (This)->lpVtbl -> GetDefaultPortableUserInterfaceFontInfo(This,pbstrCompositeFont) ) \r
-\r
-#define IXcpControlHost3_GetComAutomationObject(This,bstrProgId,dwFlags,ppDisp)        \\r
-    ( (This)->lpVtbl -> GetComAutomationObject(This,bstrProgId,dwFlags,ppDisp) ) \r
-\r
-#endif /* COBJMACROS */\r
-\r
-\r
-#endif         /* C style interface */\r
-\r
-\r
-\r
-\r
-#endif         /* __IXcpControlHost3_INTERFACE_DEFINED__ */\r
-\r
-\r
-\r
-#ifndef __XcpControlLib_LIBRARY_DEFINED__\r
-#define __XcpControlLib_LIBRARY_DEFINED__\r
-\r
-/* library XcpControlLib */\r
-/* [control][helpstring][version][uuid] */ \r
-\r
-\r
-EXTERN_C const IID LIBID_XcpControlLib;\r
-\r
-EXTERN_C const CLSID CLSID_XcpControl;\r
-\r
-#ifdef __cplusplus\r
-\r
-class DECLSPEC_UUID("DFEAF541-F3E1-4c24-ACAC-99C30715084A")\r
-XcpControl;\r
-#endif\r
-#endif /* __XcpControlLib_LIBRARY_DEFINED__ */\r
-\r
-/* Additional Prototypes for ALL interfaces */\r
-\r
-unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); \r
-unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); \r
-unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); \r
-void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); \r
-\r
-unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * ); \r
-unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * ); \r
-unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); \r
-void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * ); \r
-\r
-/* end of Additional Prototypes */\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-\r
-\r

diff --git a/modules/silverlight/interop/xcpctrl_i.c b/modules/silverlight/interop/xcpctrl_i.c
deleted file mode 100644 (file)
index e6a25ca..0000000
--- a/modules/silverlight/interop/xcpctrl_i.c
+++ /dev/null
@@ -1,103 +0,0 @@
-\r
-\r
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */\r
-\r
-/* link this file in with the server and any clients */\r
-\r
-\r
- /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Jan 22 19:55:15 2011\r
- */\r
-/* Compiler settings for xcpctrl.idl:\r
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
-    protocol : dce , ms_ext, c_ext, robust\r
-    error checks: allocation ref bounds_check enum stub_data \r
-    VC __declspec() decoration level: \r
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)\r
-         DECLSPEC_UUID(), MIDL_INTERFACE()\r
-*/\r
-/* @@MIDL_FILE_HEADING(  ) */\r
-\r
-#pragma warning( disable: 4049 )  /* more than 64k source lines */\r
-\r
-\r
-#ifdef __cplusplus\r
-extern "C"{\r
-#endif \r
-\r
-\r
-#include <rpc.h>\r
-#include <rpcndr.h>\r
-\r
-#ifdef _MIDL_USE_GUIDDEF_\r
-\r
-#ifndef INITGUID\r
-#define INITGUID\r
-#include <guiddef.h>\r
-#undef INITGUID\r
-#else\r
-#include <guiddef.h>\r
-#endif\r
-\r
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\r
-        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\r
-\r
-#else // !_MIDL_USE_GUIDDEF_\r
-\r
-#ifndef __IID_DEFINED__\r
-#define __IID_DEFINED__\r
-\r
-typedef struct _IID\r
-{\r
-    unsigned long x;\r
-    unsigned short s1;\r
-    unsigned short s2;\r
-    unsigned char  c[8];\r
-} IID;\r
-\r
-#endif // __IID_DEFINED__\r
-\r
-#ifndef CLSID_DEFINED\r
-#define CLSID_DEFINED\r
-typedef IID CLSID;\r
-#endif // CLSID_DEFINED\r
-\r
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\r
-        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\r
-\r
-#endif !_MIDL_USE_GUIDDEF_\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpObject,0xEE38D0F1,0x5AE3,0x408c,0xA6,0xBF,0x84,0x10,0xE6,0x45,0xF3,0x76);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControl,0x1FB839CC,0x116C,0x4C9B,0xAE,0x8E,0x3D,0xBB,0x64,0x96,0xE3,0x26);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControl2,0x1c3294f9,0x891f,0x49b1,0xbb,0xae,0x49,0x2a,0x68,0xba,0x10,0xcc);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControlDownloadCallback,0x2E340632,0x5D5A,0x427b,0xAC,0x31,0x30,0x3F,0x6E,0x32,0xB9,0xE8);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControlHost,0x1B36028E,0xB491,0x4bb2,0x85,0x84,0x8A,0x9E,0x0A,0x67,0x7D,0x6E);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControlHost2,0xfb3ed7c4,0x5797,0x4b44,0x86,0x95,0x0c,0x51,0x2e,0xa2,0x7d,0x8f);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, IID_IXcpControlHost3,0x9fb2ce5f,0x06ff,0x4058,0xbe,0xfa,0xdd,0xfa,0xb5,0x96,0xb3,0xd5);\r
-\r
-\r
-MIDL_DEFINE_GUID(IID, LIBID_XcpControlLib,0x283C8576,0x0726,0x4DBC,0x96,0x09,0x3F,0x85,0x51,0x62,0x00,0x9A);\r
-\r
-\r
-MIDL_DEFINE_GUID(CLSID, CLSID_XcpControl,0xDFEAF541,0xF3E1,0x4c24,0xAC,0xAC,0x99,0xC3,0x07,0x15,0x08,0x4A);\r
-\r
-#undef MIDL_DEFINE_GUID\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-\r

diff --git a/modules/silverlight/interop/xcpctrl_p.c b/modules/silverlight/interop/xcpctrl_p.c
deleted file mode 100644 (file)
index 1ea6d74..0000000
--- a/modules/silverlight/interop/xcpctrl_p.c
+++ /dev/null
@@ -1,2700 +0,0 @@
-\r
-\r
-/* this ALWAYS GENERATED file contains the proxy stub code */\r
-\r
-\r
- /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Jan 22 19:55:15 2011\r
- */\r
-/* Compiler settings for xcpctrl.idl:\r
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
-    protocol : dce , ms_ext, c_ext, robust\r
-    error checks: allocation ref bounds_check enum stub_data \r
-    VC __declspec() decoration level: \r
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)\r
-         DECLSPEC_UUID(), MIDL_INTERFACE()\r
-*/\r
-/* @@MIDL_FILE_HEADING(  ) */\r
-\r
-#if !defined(_M_IA64) && !defined(_M_AMD64)\r
-\r
-\r
-#pragma warning( disable: 4049 )  /* more than 64k source lines */\r
-#if _MSC_VER >= 1200\r
-#pragma warning(push)\r
-#endif\r
-\r
-#pragma warning( disable: 4211 )  /* redefine extern to static */\r
-#pragma warning( disable: 4232 )  /* dllimport identity*/\r
-#pragma warning( disable: 4024 )  /* array to pointer mapping*/\r
-#pragma warning( disable: 4152 )  /* function/data pointer conversion in expression */\r
-#pragma warning( disable: 4100 ) /* unreferenced arguments in x86 call */\r
-\r
-#pragma optimize("", off ) \r
-\r
-#define USE_STUBLESS_PROXY\r
-\r
-\r
-/* verify that the <rpcproxy.h> version is high enough to compile this file*/\r
-#ifndef __REDQ_RPCPROXY_H_VERSION__\r
-#define __REQUIRED_RPCPROXY_H_VERSION__ 475\r
-#endif\r
-\r
-\r
-#include "rpcproxy.h"\r
-#ifndef __RPCPROXY_H_VERSION__\r
-#error this stub requires an updated version of <rpcproxy.h>\r
-#endif /* __RPCPROXY_H_VERSION__ */\r
-\r
-\r
-#include "xcpctrl_h.h"\r
-\r
-#define TYPE_FORMAT_STRING_SIZE   1163                              \r
-#define PROC_FORMAT_STRING_SIZE   1237                              \r
-#define EXPR_FORMAT_STRING_SIZE   1                                 \r
-#define TRANSMIT_AS_TABLE_SIZE    0            \r
-#define WIRE_MARSHAL_TABLE_SIZE   2            \r
-\r
-typedef struct _xcpctrl_MIDL_TYPE_FORMAT_STRING\r
-    {\r
-    short          Pad;\r
-    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];\r
-    } xcpctrl_MIDL_TYPE_FORMAT_STRING;\r
-\r
-typedef struct _xcpctrl_MIDL_PROC_FORMAT_STRING\r
-    {\r
-    short          Pad;\r
-    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];\r
-    } xcpctrl_MIDL_PROC_FORMAT_STRING;\r
-\r
-typedef struct _xcpctrl_MIDL_EXPR_FORMAT_STRING\r
-    {\r
-    long          Pad;\r
-    unsigned char  Format[ EXPR_FORMAT_STRING_SIZE ];\r
-    } xcpctrl_MIDL_EXPR_FORMAT_STRING;\r
-\r
-\r
-static const RPC_SYNTAX_IDENTIFIER  _RpcTransferSyntax = \r
-{{0x8A885D04,0x1CEB,0x11C9,{0x9F,0xE8,0x08,0x00,0x2B,0x10,0x48,0x60}},{2,0}};\r
-\r
-\r
-extern const xcpctrl_MIDL_TYPE_FORMAT_STRING xcpctrl__MIDL_TypeFormatString;\r
-extern const xcpctrl_MIDL_PROC_FORMAT_STRING xcpctrl__MIDL_ProcFormatString;\r
-extern const xcpctrl_MIDL_EXPR_FORMAT_STRING xcpctrl__MIDL_ExprFormatString;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpObject_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpObject_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControl_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControl_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControl2_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControl2_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControlDownloadCallback_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControlDownloadCallback_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControlHost_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControlHost_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControlHost2_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControlHost2_ProxyInfo;\r
-\r
-\r
-extern const MIDL_STUB_DESC Object_StubDesc;\r
-\r
-\r
-extern const MIDL_SERVER_INFO IXcpControlHost3_ServerInfo;\r
-extern const MIDL_STUBLESS_PROXY_INFO IXcpControlHost3_ProxyInfo;\r
-\r
-\r
-extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ];\r
-\r
-#if !defined(__RPC_WIN32__)\r
-#error  Invalid build platform for this stub.\r
-#endif\r
-\r
-#if !(TARGET_IS_NT50_OR_LATER)\r
-#error You need Windows 2000 or later to run this stub because it uses these features:\r
-#error   /robust command line switch.\r
-#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.\r
-#error This app will fail with the RPC_X_WRONG_STUB_VERSION error.\r
-#endif\r
-\r
-\r
-static const xcpctrl_MIDL_PROC_FORMAT_STRING xcpctrl__MIDL_ProcFormatString =\r
-    {\r
-        0,\r
-        {\r
-\r
-       /* Procedure GetBaseUrl */\r
-\r
-\r
-       /* Procedure get_Source */\r
-\r
-                       0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/*  2 */       NdrFcLong( 0x0 ),       /* 0 */\r
-/*  6 */       NdrFcShort( 0x7 ),      /* 7 */\r
-/*  8 */       NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 10 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 12 */       NdrFcShort( 0x8 ),      /* 8 */\r
-/* 14 */       0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 16 */       0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 18 */       NdrFcShort( 0x1 ),      /* 1 */\r
-/* 20 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 22 */       NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pbstrUrl */\r
-\r
-\r
-       /* Parameter pstr */\r
-\r
-/* 24 */       NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 26 */       NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 28 */       NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-\r
-       /* Return value */\r
-\r
-/* 30 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 32 */       NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 34 */       0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_Source */\r
-\r
-/* 36 */       0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 38 */       NdrFcLong( 0x0 ),       /* 0 */\r
-/* 42 */       NdrFcShort( 0x8 ),      /* 8 */\r
-/* 44 */       NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 46 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 48 */       NdrFcShort( 0x8 ),      /* 8 */\r
-/* 50 */       0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 52 */       0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 54 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 56 */       NdrFcShort( 0x1 ),      /* 1 */\r
-/* 58 */       NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter str */\r
-\r
-/* 60 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 62 */       NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 64 */       NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Return value */\r
-\r
-/* 66 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 68 */       NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 70 */       0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_IsLoaded */\r
-\r
-/* 72 */       0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 74 */       NdrFcLong( 0x0 ),       /* 0 */\r
-/* 78 */       NdrFcShort( 0x9 ),      /* 9 */\r
-/* 80 */       NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 82 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 84 */       NdrFcShort( 0x22 ),     /* 34 */\r
-/* 86 */       0x44,           /* Oi2 Flags:  has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 88 */       0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 90 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 92 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 94 */       NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pb */\r
-\r
-/* 96 */       NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 98 */       NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 100 */      0x6,            /* FC_SHORT */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 102 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 104 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 106 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_Content */\r
-\r
-/* 108 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 110 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 114 */      NdrFcShort( 0xa ),      /* 10 */\r
-/* 116 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 118 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 120 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 122 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 124 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 126 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 128 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 130 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter ppContent */\r
-\r
-/* 132 */      NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 134 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 136 */      NdrFcShort( 0x3c ),     /* Type Offset=60 */\r
-\r
-       /* Return value */\r
-\r
-/* 138 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 140 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 142 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_Settings */\r
-\r
-/* 144 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 146 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 150 */      NdrFcShort( 0xb ),      /* 11 */\r
-/* 152 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 154 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 156 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 158 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 160 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 162 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 164 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 166 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter ppSettings */\r
-\r
-/* 168 */      NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 170 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 172 */      NdrFcShort( 0x3c ),     /* Type Offset=60 */\r
-\r
-       /* Return value */\r
-\r
-/* 174 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 176 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 178 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_OnLoad */\r
-\r
-/* 180 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 182 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 186 */      NdrFcShort( 0xc ),      /* 12 */\r
-/* 188 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 190 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 192 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 194 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 196 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 198 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 200 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 202 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 204 */      NdrFcShort( 0x4113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=16 */\r
-/* 206 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 208 */      NdrFcShort( 0x428 ),    /* Type Offset=1064 */\r
-\r
-       /* Return value */\r
-\r
-/* 210 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 212 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 214 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_OnLoad */\r
-\r
-/* 216 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 218 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 222 */      NdrFcShort( 0xd ),      /* 13 */\r
-/* 224 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 226 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 228 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 230 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 232 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 234 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 236 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 238 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 240 */      NdrFcShort( 0x10b ),    /* Flags:  must size, must free, in, simple ref, */\r
-/* 242 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 244 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Return value */\r
-\r
-/* 246 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 248 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 250 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_OnError */\r
-\r
-/* 252 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 254 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 258 */      NdrFcShort( 0xe ),      /* 14 */\r
-/* 260 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 262 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 264 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 266 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 268 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 270 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 272 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 274 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 276 */      NdrFcShort( 0x4113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=16 */\r
-/* 278 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 280 */      NdrFcShort( 0x428 ),    /* Type Offset=1064 */\r
-\r
-       /* Return value */\r
-\r
-/* 282 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 284 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 286 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_OnError */\r
-\r
-/* 288 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 290 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 294 */      NdrFcShort( 0xf ),      /* 15 */\r
-/* 296 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 298 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 300 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 302 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 304 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 306 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 308 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 310 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 312 */      NdrFcShort( 0x10b ),    /* Flags:  must size, must free, in, simple ref, */\r
-/* 314 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 316 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Return value */\r
-\r
-/* 318 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 320 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 322 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure CreateObject */\r
-\r
-/* 324 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 326 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 330 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 332 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 334 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 336 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 338 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 340 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 342 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 344 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 346 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter id */\r
-\r
-/* 348 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 350 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 352 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter ppDisp */\r
-\r
-/* 354 */      NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 356 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 358 */      NdrFcShort( 0x444 ),    /* Type Offset=1092 */\r
-\r
-       /* Return value */\r
-\r
-/* 360 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 362 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 364 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure IsVersionSupported */\r
-\r
-/* 366 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 368 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 372 */      NdrFcShort( 0x11 ),     /* 17 */\r
-/* 374 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 376 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 378 */      NdrFcShort( 0x22 ),     /* 34 */\r
-/* 380 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 382 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 384 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 386 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 388 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter v */\r
-\r
-/* 390 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 392 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 394 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter pb */\r
-\r
-/* 396 */      NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 398 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 400 */      0x6,            /* FC_SHORT */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 402 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 404 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 406 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_InitParams */\r
-\r
-/* 408 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 410 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 414 */      NdrFcShort( 0x12 ),     /* 18 */\r
-/* 416 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 418 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 420 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 422 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 424 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 426 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 428 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 430 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter initparams */\r
-\r
-/* 432 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 434 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 436 */      NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-/* 438 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 440 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 442 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_InitParams */\r
-\r
-/* 444 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 446 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 450 */      NdrFcShort( 0x13 ),     /* 19 */\r
-/* 452 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 454 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 456 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 458 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 460 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 462 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 464 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 466 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter initparams */\r
-\r
-/* 468 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 470 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 472 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Return value */\r
-\r
-/* 474 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 476 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 478 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure LoadRuntime */\r
-\r
-/* 480 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 482 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 486 */      NdrFcShort( 0x14 ),     /* 20 */\r
-/* 488 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 490 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 492 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 494 */      0x44,           /* Oi2 Flags:  has return, has ext, */\r
-                       0x1,            /* 1 */\r
-/* 496 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 498 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 500 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 502 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 504 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 506 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 508 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_SplashScreenSource */\r
-\r
-/* 510 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 512 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 516 */      NdrFcShort( 0x15 ),     /* 21 */\r
-/* 518 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 520 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 522 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 524 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 526 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 528 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 530 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 532 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pstr */\r
-\r
-/* 534 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 536 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 538 */      NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-/* 540 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 542 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 544 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_SplashScreenSource */\r
-\r
-/* 546 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 548 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 552 */      NdrFcShort( 0x16 ),     /* 22 */\r
-/* 554 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 556 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 558 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 560 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 562 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 564 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 566 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 568 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter str */\r
-\r
-/* 570 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 572 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 574 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Return value */\r
-\r
-/* 576 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 578 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 580 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_OnSourceDownloadComplete */\r
-\r
-/* 582 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 584 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 588 */      NdrFcShort( 0x17 ),     /* 23 */\r
-/* 590 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 592 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 594 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 596 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 598 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 600 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 602 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 604 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 606 */      NdrFcShort( 0x4113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=16 */\r
-/* 608 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 610 */      NdrFcShort( 0x428 ),    /* Type Offset=1064 */\r
-\r
-       /* Return value */\r
-\r
-/* 612 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 614 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 616 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_OnSourceDownloadComplete */\r
-\r
-/* 618 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 620 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 624 */      NdrFcShort( 0x18 ),     /* 24 */\r
-/* 626 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 628 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 630 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 632 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 634 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 636 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 638 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 640 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 642 */      NdrFcShort( 0x10b ),    /* Flags:  must size, must free, in, simple ref, */\r
-/* 644 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 646 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Return value */\r
-\r
-/* 648 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 650 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 652 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure get_OnSourceDownloadProgressChanged */\r
-\r
-/* 654 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 656 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 660 */      NdrFcShort( 0x19 ),     /* 25 */\r
-/* 662 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 664 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 666 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 668 */      0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 670 */      0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 672 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 674 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 676 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 678 */      NdrFcShort( 0x4113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=16 */\r
-/* 680 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 682 */      NdrFcShort( 0x428 ),    /* Type Offset=1064 */\r
-\r
-       /* Return value */\r
-\r
-/* 684 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 686 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 688 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure put_OnSourceDownloadProgressChanged */\r
-\r
-/* 690 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 692 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 696 */      NdrFcShort( 0x1a ),     /* 26 */\r
-/* 698 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 700 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 702 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 704 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 706 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 708 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 710 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 712 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pVAR */\r
-\r
-/* 714 */      NdrFcShort( 0x10b ),    /* Flags:  must size, must free, in, simple ref, */\r
-/* 716 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 718 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Return value */\r
-\r
-/* 720 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 722 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 724 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure OnUrlDownloaded */\r
-\r
-/* 726 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 728 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 732 */      NdrFcShort( 0x3 ),      /* 3 */\r
-/* 734 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 736 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 738 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 740 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 742 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 744 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 746 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 748 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter hr */\r
-\r
-/* 750 */      NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
-/* 752 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 754 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Parameter pStream */\r
-\r
-/* 756 */      NdrFcShort( 0xb ),      /* Flags:  must size, must free, in, */\r
-/* 758 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 760 */      NdrFcShort( 0x45a ),    /* Type Offset=1114 */\r
-\r
-       /* Return value */\r
-\r
-/* 762 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 764 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 766 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetHostOptions */\r
-\r
-/* 768 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 770 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 774 */      NdrFcShort( 0x3 ),      /* 3 */\r
-/* 776 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 778 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 780 */      NdrFcShort( 0x24 ),     /* 36 */\r
-/* 782 */      0x44,           /* Oi2 Flags:  has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 784 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 786 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 788 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 790 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pdwOptions */\r
-\r
-/* 792 */      NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 794 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 796 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 798 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 800 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 802 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure NotifyLoaded */\r
-\r
-/* 804 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 806 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 810 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 812 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 814 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 816 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 818 */      0x44,           /* Oi2 Flags:  has return, has ext, */\r
-                       0x1,            /* 1 */\r
-/* 820 */      0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 822 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 824 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 826 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 828 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 830 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 832 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure NotifyError */\r
-\r
-/* 834 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 836 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 840 */      NdrFcShort( 0x5 ),      /* 5 */\r
-/* 842 */      NdrFcShort( 0x18 ),     /* x86 Stack size/offset = 24 */\r
-/* 844 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 846 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 848 */      0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
-                       0x5,            /* 5 */\r
-/* 850 */      0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 852 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 854 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 856 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter bstrError */\r
-\r
-/* 858 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 860 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 862 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter bstrSource */\r
-\r
-/* 864 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 866 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 868 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter nLine */\r
-\r
-/* 870 */      NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
-/* 872 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 874 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Parameter nColumn */\r
-\r
-/* 876 */      NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
-/* 878 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 880 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 882 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 884 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 886 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure InvokeHandler */\r
-\r
-/* 888 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 890 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 894 */      NdrFcShort( 0x6 ),      /* 6 */\r
-/* 896 */      NdrFcShort( 0x30 ),     /* x86 Stack size/offset = 48 */\r
-/* 898 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 900 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 902 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x5,            /* 5 */\r
-/* 904 */      0x8,            /* 8 */\r
-                       0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 906 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 908 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 910 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter bstrName */\r
-\r
-/* 912 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 914 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 916 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter varArg1 */\r
-\r
-/* 918 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 920 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 922 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Parameter varArg2 */\r
-\r
-/* 924 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 926 */      NdrFcShort( 0x18 ),     /* x86 Stack size/offset = 24 */\r
-/* 928 */      NdrFcShort( 0x43a ),    /* Type Offset=1082 */\r
-\r
-       /* Parameter pvarResult */\r
-\r
-/* 930 */      NdrFcShort( 0x4113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=16 */\r
-/* 932 */      NdrFcShort( 0x28 ),     /* x86 Stack size/offset = 40 */\r
-/* 934 */      NdrFcShort( 0x428 ),    /* Type Offset=1064 */\r
-\r
-       /* Return value */\r
-\r
-/* 936 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 938 */      NdrFcShort( 0x2c ),     /* x86 Stack size/offset = 44 */\r
-/* 940 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetNamedSource */\r
-\r
-/* 942 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 944 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 948 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 950 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 952 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 954 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 956 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 958 */      0x8,            /* 8 */\r
-                       0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 960 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 962 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 964 */      NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter bstrSourceName */\r
-\r
-/* 966 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 968 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 970 */      NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter pbstrSource */\r
-\r
-/* 972 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 974 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 976 */      NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-/* 978 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 980 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 982 */      0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure DownloadUrl */\r
-\r
-/* 984 */      0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 986 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 990 */      NdrFcShort( 0x9 ),      /* 9 */\r
-/* 992 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 994 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 996 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 998 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x4,            /* 4 */\r
-/* 1000 */     0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 1002 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1004 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1006 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter bstrUrl */\r
-\r
-/* 1008 */     NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 1010 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1012 */     NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter pCallback */\r
-\r
-/* 1014 */     NdrFcShort( 0xb ),      /* Flags:  must size, must free, in, */\r
-/* 1016 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1018 */     NdrFcShort( 0x470 ),    /* Type Offset=1136 */\r
-\r
-       /* Parameter ppStream */\r
-\r
-/* 1020 */     NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 1022 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1024 */     NdrFcShort( 0x482 ),    /* Type Offset=1154 */\r
-\r
-       /* Return value */\r
-\r
-/* 1026 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1028 */     NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 1030 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetCustomAppDomain */\r
-\r
-/* 1032 */     0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 1034 */     NdrFcLong( 0x0 ),       /* 0 */\r
-/* 1038 */     NdrFcShort( 0xa ),      /* 10 */\r
-/* 1040 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1042 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1044 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1046 */     0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 1048 */     0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 1050 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1052 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1054 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter ppAppDomain */\r
-\r
-/* 1056 */     NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 1058 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1060 */     NdrFcShort( 0x486 ),    /* Type Offset=1158 */\r
-\r
-       /* Return value */\r
-\r
-/* 1062 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1064 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1066 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetControlVersion */\r
-\r
-/* 1068 */     0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 1070 */     NdrFcLong( 0x0 ),       /* 0 */\r
-/* 1074 */     NdrFcShort( 0xb ),      /* 11 */\r
-/* 1076 */     NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 1078 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1080 */     NdrFcShort( 0x40 ),     /* 64 */\r
-/* 1082 */     0x44,           /* Oi2 Flags:  has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 1084 */     0x8,            /* 8 */\r
-                       0x1,            /* Ext Flags:  new corr desc, */\r
-/* 1086 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1088 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1090 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter puMajorVersion */\r
-\r
-/* 1092 */     NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 1094 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1096 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Parameter puMinorVersion */\r
-\r
-/* 1098 */     NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 1100 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1102 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Return value */\r
-\r
-/* 1104 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1106 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1108 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetDefaultThemeXaml */\r
-\r
-/* 1110 */     0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 1112 */     NdrFcLong( 0x0 ),       /* 0 */\r
-/* 1116 */     NdrFcShort( 0xc ),      /* 12 */\r
-/* 1118 */     NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 1120 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1122 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1124 */     0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x3,            /* 3 */\r
-/* 1126 */     0x8,            /* 8 */\r
-                       0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 1128 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1130 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1132 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter assemblyName */\r
-\r
-/* 1134 */     NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 1136 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1138 */     NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter pbstrXaml */\r
-\r
-/* 1140 */     NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 1142 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1144 */     NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-/* 1146 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1148 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1150 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetDefaultPortableUserInterfaceFontInfo */\r
-\r
-/* 1152 */     0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 1154 */     NdrFcLong( 0x0 ),       /* 0 */\r
-/* 1158 */     NdrFcShort( 0xd ),      /* 13 */\r
-/* 1160 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1162 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1164 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1166 */     0x45,           /* Oi2 Flags:  srv must size, has return, has ext, */\r
-                       0x2,            /* 2 */\r
-/* 1168 */     0x8,            /* 8 */\r
-                       0x3,            /* Ext Flags:  new corr desc, clt corr check, */\r
-/* 1170 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1172 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1174 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter pbstrCompositeFont */\r
-\r
-/* 1176 */     NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 1178 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1180 */     NdrFcShort( 0x20 ),     /* Type Offset=32 */\r
-\r
-       /* Return value */\r
-\r
-/* 1182 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1184 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1186 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Procedure GetComAutomationObject */\r
-\r
-/* 1188 */     0x33,           /* FC_AUTO_HANDLE */\r
-                       0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 1190 */     NdrFcLong( 0x0 ),       /* 0 */\r
-/* 1194 */     NdrFcShort( 0xe ),      /* 14 */\r
-/* 1196 */     NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 1198 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1200 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1202 */     0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
-                       0x4,            /* 4 */\r
-/* 1204 */     0x8,            /* 8 */\r
-                       0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
-/* 1206 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1208 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1210 */     NdrFcShort( 0x0 ),      /* 0 */\r
-\r
-       /* Parameter bstrProgId */\r
-\r
-/* 1212 */     NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 1214 */     NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 1216 */     NdrFcShort( 0x2e ),     /* Type Offset=46 */\r
-\r
-       /* Parameter dwFlags */\r
-\r
-/* 1218 */     NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
-/* 1220 */     NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 1222 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-       /* Parameter ppDisp */\r
-\r
-/* 1224 */     NdrFcShort( 0x13 ),     /* Flags:  must size, must free, out, */\r
-/* 1226 */     NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 1228 */     NdrFcShort( 0x3c ),     /* Type Offset=60 */\r
-\r
-       /* Return value */\r
-\r
-/* 1230 */     NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 1232 */     NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 1234 */     0x8,            /* FC_LONG */\r
-                       0x0,            /* 0 */\r
-\r
-                       0x0\r
-        }\r
-    };\r
-\r
-static const xcpctrl_MIDL_TYPE_FORMAT_STRING xcpctrl__MIDL_TypeFormatString =\r
-    {\r
-        0,\r
-        {\r
-                       NdrFcShort( 0x0 ),      /* 0 */\r
-/*  2 */       \r
-                       0x11, 0x4,      /* FC_RP [alloced_on_stack] */\r
-/*  4 */       NdrFcShort( 0x1c ),     /* Offset= 28 (32) */\r
-/*  6 */       \r
-                       0x13, 0x0,      /* FC_OP */\r
-/*  8 */       NdrFcShort( 0xe ),      /* Offset= 14 (22) */\r
-/* 10 */       \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x1,            /* 1 */\r
-/* 12 */       NdrFcShort( 0x2 ),      /* 2 */\r
-/* 14 */       0x9,            /* Corr desc: FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 16 */       NdrFcShort( 0xfffc ),   /* -4 */\r
-/* 18 */       NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 20 */       0x6,            /* FC_SHORT */\r
-                       0x5b,           /* FC_END */\r
-/* 22 */       \r
-                       0x17,           /* FC_CSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 24 */       NdrFcShort( 0x8 ),      /* 8 */\r
-/* 26 */       NdrFcShort( 0xfff0 ),   /* Offset= -16 (10) */\r
-/* 28 */       0x8,            /* FC_LONG */\r
-                       0x8,            /* FC_LONG */\r
-/* 30 */       0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 32 */       0xb4,           /* FC_USER_MARSHAL */\r
-                       0x83,           /* 131 */\r
-/* 34 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 36 */       NdrFcShort( 0x4 ),      /* 4 */\r
-/* 38 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 40 */       NdrFcShort( 0xffde ),   /* Offset= -34 (6) */\r
-/* 42 */       \r
-                       0x12, 0x0,      /* FC_UP */\r
-/* 44 */       NdrFcShort( 0xffea ),   /* Offset= -22 (22) */\r
-/* 46 */       0xb4,           /* FC_USER_MARSHAL */\r
-                       0x83,           /* 131 */\r
-/* 48 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 50 */       NdrFcShort( 0x4 ),      /* 4 */\r
-/* 52 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 54 */       NdrFcShort( 0xfff4 ),   /* Offset= -12 (42) */\r
-/* 56 */       \r
-                       0x11, 0xc,      /* FC_RP [alloced_on_stack] [simple_pointer] */\r
-/* 58 */       0x6,            /* FC_SHORT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 60 */       \r
-                       0x11, 0x10,     /* FC_RP [pointer_deref] */\r
-/* 62 */       NdrFcShort( 0x2 ),      /* Offset= 2 (64) */\r
-/* 64 */       \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 66 */       NdrFcLong( 0x20400 ),   /* 132096 */\r
-/* 70 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 72 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 74 */       0xc0,           /* 192 */\r
-                       0x0,            /* 0 */\r
-/* 76 */       0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 78 */       0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 80 */       0x0,            /* 0 */\r
-                       0x46,           /* 70 */\r
-/* 82 */       \r
-                       0x11, 0x4,      /* FC_RP [alloced_on_stack] */\r
-/* 84 */       NdrFcShort( 0x3d4 ),    /* Offset= 980 (1064) */\r
-/* 86 */       \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 88 */       NdrFcShort( 0x3bc ),    /* Offset= 956 (1044) */\r
-/* 90 */       \r
-                       0x2b,           /* FC_NON_ENCAPSULATED_UNION */\r
-                       0x9,            /* FC_ULONG */\r
-/* 92 */       0x7,            /* Corr desc: FC_USHORT */\r
-                       0x0,            /*  */\r
-/* 94 */       NdrFcShort( 0xfff8 ),   /* -8 */\r
-/* 96 */       NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 98 */       NdrFcShort( 0x2 ),      /* Offset= 2 (100) */\r
-/* 100 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 102 */      NdrFcShort( 0x2f ),     /* 47 */\r
-/* 104 */      NdrFcLong( 0x14 ),      /* 20 */\r
-/* 108 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
-/* 110 */      NdrFcLong( 0x3 ),       /* 3 */\r
-/* 114 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 116 */      NdrFcLong( 0x11 ),      /* 17 */\r
-/* 120 */      NdrFcShort( 0x8001 ),   /* Simple arm type: FC_BYTE */\r
-/* 122 */      NdrFcLong( 0x2 ),       /* 2 */\r
-/* 126 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 128 */      NdrFcLong( 0x4 ),       /* 4 */\r
-/* 132 */      NdrFcShort( 0x800a ),   /* Simple arm type: FC_FLOAT */\r
-/* 134 */      NdrFcLong( 0x5 ),       /* 5 */\r
-/* 138 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
-/* 140 */      NdrFcLong( 0xb ),       /* 11 */\r
-/* 144 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 146 */      NdrFcLong( 0xa ),       /* 10 */\r
-/* 150 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 152 */      NdrFcLong( 0x6 ),       /* 6 */\r
-/* 156 */      NdrFcShort( 0xe8 ),     /* Offset= 232 (388) */\r
-/* 158 */      NdrFcLong( 0x7 ),       /* 7 */\r
-/* 162 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
-/* 164 */      NdrFcLong( 0x8 ),       /* 8 */\r
-/* 168 */      NdrFcShort( 0xff5e ),   /* Offset= -162 (6) */\r
-/* 170 */      NdrFcLong( 0xd ),       /* 13 */\r
-/* 174 */      NdrFcShort( 0xdc ),     /* Offset= 220 (394) */\r
-/* 176 */      NdrFcLong( 0x9 ),       /* 9 */\r
-/* 180 */      NdrFcShort( 0xff8c ),   /* Offset= -116 (64) */\r
-/* 182 */      NdrFcLong( 0x2000 ),    /* 8192 */\r
-/* 186 */      NdrFcShort( 0xe2 ),     /* Offset= 226 (412) */\r
-/* 188 */      NdrFcLong( 0x24 ),      /* 36 */\r
-/* 192 */      NdrFcShort( 0x30a ),    /* Offset= 778 (970) */\r
-/* 194 */      NdrFcLong( 0x4024 ),    /* 16420 */\r
-/* 198 */      NdrFcShort( 0x304 ),    /* Offset= 772 (970) */\r
-/* 200 */      NdrFcLong( 0x4011 ),    /* 16401 */\r
-/* 204 */      NdrFcShort( 0x302 ),    /* Offset= 770 (974) */\r
-/* 206 */      NdrFcLong( 0x4002 ),    /* 16386 */\r
-/* 210 */      NdrFcShort( 0x300 ),    /* Offset= 768 (978) */\r
-/* 212 */      NdrFcLong( 0x4003 ),    /* 16387 */\r
-/* 216 */      NdrFcShort( 0x2fe ),    /* Offset= 766 (982) */\r
-/* 218 */      NdrFcLong( 0x4014 ),    /* 16404 */\r
-/* 222 */      NdrFcShort( 0x2fc ),    /* Offset= 764 (986) */\r
-/* 224 */      NdrFcLong( 0x4004 ),    /* 16388 */\r
-/* 228 */      NdrFcShort( 0x2fa ),    /* Offset= 762 (990) */\r
-/* 230 */      NdrFcLong( 0x4005 ),    /* 16389 */\r
-/* 234 */      NdrFcShort( 0x2f8 ),    /* Offset= 760 (994) */\r
-/* 236 */      NdrFcLong( 0x400b ),    /* 16395 */\r
-/* 240 */      NdrFcShort( 0x2e2 ),    /* Offset= 738 (978) */\r
-/* 242 */      NdrFcLong( 0x400a ),    /* 16394 */\r
-/* 246 */      NdrFcShort( 0x2e0 ),    /* Offset= 736 (982) */\r
-/* 248 */      NdrFcLong( 0x4006 ),    /* 16390 */\r
-/* 252 */      NdrFcShort( 0x2ea ),    /* Offset= 746 (998) */\r
-/* 254 */      NdrFcLong( 0x4007 ),    /* 16391 */\r
-/* 258 */      NdrFcShort( 0x2e0 ),    /* Offset= 736 (994) */\r
-/* 260 */      NdrFcLong( 0x4008 ),    /* 16392 */\r
-/* 264 */      NdrFcShort( 0x2e2 ),    /* Offset= 738 (1002) */\r
-/* 266 */      NdrFcLong( 0x400d ),    /* 16397 */\r
-/* 270 */      NdrFcShort( 0x2e0 ),    /* Offset= 736 (1006) */\r
-/* 272 */      NdrFcLong( 0x4009 ),    /* 16393 */\r
-/* 276 */      NdrFcShort( 0x2de ),    /* Offset= 734 (1010) */\r
-/* 278 */      NdrFcLong( 0x6000 ),    /* 24576 */\r
-/* 282 */      NdrFcShort( 0x2dc ),    /* Offset= 732 (1014) */\r
-/* 284 */      NdrFcLong( 0x400c ),    /* 16396 */\r
-/* 288 */      NdrFcShort( 0x2da ),    /* Offset= 730 (1018) */\r
-/* 290 */      NdrFcLong( 0x10 ),      /* 16 */\r
-/* 294 */      NdrFcShort( 0x8002 ),   /* Simple arm type: FC_CHAR */\r
-/* 296 */      NdrFcLong( 0x12 ),      /* 18 */\r
-/* 300 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 302 */      NdrFcLong( 0x13 ),      /* 19 */\r
-/* 306 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 308 */      NdrFcLong( 0x15 ),      /* 21 */\r
-/* 312 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
-/* 314 */      NdrFcLong( 0x16 ),      /* 22 */\r
-/* 318 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 320 */      NdrFcLong( 0x17 ),      /* 23 */\r
-/* 324 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 326 */      NdrFcLong( 0xe ),       /* 14 */\r
-/* 330 */      NdrFcShort( 0x2b8 ),    /* Offset= 696 (1026) */\r
-/* 332 */      NdrFcLong( 0x400e ),    /* 16398 */\r
-/* 336 */      NdrFcShort( 0x2bc ),    /* Offset= 700 (1036) */\r
-/* 338 */      NdrFcLong( 0x4010 ),    /* 16400 */\r
-/* 342 */      NdrFcShort( 0x2ba ),    /* Offset= 698 (1040) */\r
-/* 344 */      NdrFcLong( 0x4012 ),    /* 16402 */\r
-/* 348 */      NdrFcShort( 0x276 ),    /* Offset= 630 (978) */\r
-/* 350 */      NdrFcLong( 0x4013 ),    /* 16403 */\r
-/* 354 */      NdrFcShort( 0x274 ),    /* Offset= 628 (982) */\r
-/* 356 */      NdrFcLong( 0x4015 ),    /* 16405 */\r
-/* 360 */      NdrFcShort( 0x272 ),    /* Offset= 626 (986) */\r
-/* 362 */      NdrFcLong( 0x4016 ),    /* 16406 */\r
-/* 366 */      NdrFcShort( 0x268 ),    /* Offset= 616 (982) */\r
-/* 368 */      NdrFcLong( 0x4017 ),    /* 16407 */\r
-/* 372 */      NdrFcShort( 0x262 ),    /* Offset= 610 (982) */\r
-/* 374 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 378 */      NdrFcShort( 0x0 ),      /* Offset= 0 (378) */\r
-/* 380 */      NdrFcLong( 0x1 ),       /* 1 */\r
-/* 384 */      NdrFcShort( 0x0 ),      /* Offset= 0 (384) */\r
-/* 386 */      NdrFcShort( 0xffff ),   /* Offset= -1 (385) */\r
-/* 388 */      \r
-                       0x15,           /* FC_STRUCT */\r
-                       0x7,            /* 7 */\r
-/* 390 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 392 */      0xb,            /* FC_HYPER */\r
-                       0x5b,           /* FC_END */\r
-/* 394 */      \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 396 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 400 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 402 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 404 */      0xc0,           /* 192 */\r
-                       0x0,            /* 0 */\r
-/* 406 */      0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 408 */      0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 410 */      0x0,            /* 0 */\r
-                       0x46,           /* 70 */\r
-/* 412 */      \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 414 */      NdrFcShort( 0x2 ),      /* Offset= 2 (416) */\r
-/* 416 */      \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 418 */      NdrFcShort( 0x216 ),    /* Offset= 534 (952) */\r
-/* 420 */      \r
-                       0x2a,           /* FC_ENCAPSULATED_UNION */\r
-                       0x49,           /* 73 */\r
-/* 422 */      NdrFcShort( 0x18 ),     /* 24 */\r
-/* 424 */      NdrFcShort( 0xa ),      /* 10 */\r
-/* 426 */      NdrFcLong( 0x8 ),       /* 8 */\r
-/* 430 */      NdrFcShort( 0x5a ),     /* Offset= 90 (520) */\r
-/* 432 */      NdrFcLong( 0xd ),       /* 13 */\r
-/* 436 */      NdrFcShort( 0x7e ),     /* Offset= 126 (562) */\r
-/* 438 */      NdrFcLong( 0x9 ),       /* 9 */\r
-/* 442 */      NdrFcShort( 0x9e ),     /* Offset= 158 (600) */\r
-/* 444 */      NdrFcLong( 0xc ),       /* 12 */\r
-/* 448 */      NdrFcShort( 0xc8 ),     /* Offset= 200 (648) */\r
-/* 450 */      NdrFcLong( 0x24 ),      /* 36 */\r
-/* 454 */      NdrFcShort( 0x124 ),    /* Offset= 292 (746) */\r
-/* 456 */      NdrFcLong( 0x800d ),    /* 32781 */\r
-/* 460 */      NdrFcShort( 0x140 ),    /* Offset= 320 (780) */\r
-/* 462 */      NdrFcLong( 0x10 ),      /* 16 */\r
-/* 466 */      NdrFcShort( 0x15a ),    /* Offset= 346 (812) */\r
-/* 468 */      NdrFcLong( 0x2 ),       /* 2 */\r
-/* 472 */      NdrFcShort( 0x174 ),    /* Offset= 372 (844) */\r
-/* 474 */      NdrFcLong( 0x3 ),       /* 3 */\r
-/* 478 */      NdrFcShort( 0x18e ),    /* Offset= 398 (876) */\r
-/* 480 */      NdrFcLong( 0x14 ),      /* 20 */\r
-/* 484 */      NdrFcShort( 0x1a8 ),    /* Offset= 424 (908) */\r
-/* 486 */      NdrFcShort( 0xffff ),   /* Offset= -1 (485) */\r
-/* 488 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x3,            /* 3 */\r
-/* 490 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 492 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 494 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 496 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 498 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 500 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 502 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 504 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 506 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 508 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 510 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 512 */      0x13, 0x0,      /* FC_OP */\r
-/* 514 */      NdrFcShort( 0xfe14 ),   /* Offset= -492 (22) */\r
-/* 516 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 518 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 520 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 522 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 524 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 526 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 528 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 530 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 532 */      0x11, 0x0,      /* FC_RP */\r
-/* 534 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (488) */\r
-/* 536 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 538 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 540 */      \r
-                       0x21,           /* FC_BOGUS_ARRAY */\r
-                       0x3,            /* 3 */\r
-/* 542 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 544 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 546 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 548 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 550 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
-/* 554 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
-/* 556 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 558 */      NdrFcShort( 0xff5c ),   /* Offset= -164 (394) */\r
-/* 560 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 562 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 564 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 566 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 568 */      NdrFcShort( 0x6 ),      /* Offset= 6 (574) */\r
-/* 570 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 572 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 574 */      \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 576 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (540) */\r
-/* 578 */      \r
-                       0x21,           /* FC_BOGUS_ARRAY */\r
-                       0x3,            /* 3 */\r
-/* 580 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 582 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 584 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 586 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 588 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
-/* 592 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
-/* 594 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 596 */      NdrFcShort( 0xfdec ),   /* Offset= -532 (64) */\r
-/* 598 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 600 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 602 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 604 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 606 */      NdrFcShort( 0x6 ),      /* Offset= 6 (612) */\r
-/* 608 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 610 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 612 */      \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 614 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (578) */\r
-/* 616 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x3,            /* 3 */\r
-/* 618 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 620 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 622 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 624 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 626 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 628 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 630 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 632 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 634 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 636 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 638 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 640 */      0x13, 0x0,      /* FC_OP */\r
-/* 642 */      NdrFcShort( 0x192 ),    /* Offset= 402 (1044) */\r
-/* 644 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 646 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 648 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 650 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 652 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 654 */      NdrFcShort( 0x6 ),      /* Offset= 6 (660) */\r
-/* 656 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 658 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 660 */      \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 662 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (616) */\r
-/* 664 */      \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 666 */      NdrFcLong( 0x2f ),      /* 47 */\r
-/* 670 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 672 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 674 */      0xc0,           /* 192 */\r
-                       0x0,            /* 0 */\r
-/* 676 */      0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 678 */      0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 680 */      0x0,            /* 0 */\r
-                       0x46,           /* 70 */\r
-/* 682 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x0,            /* 0 */\r
-/* 684 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 686 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 688 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 690 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 692 */      0x1,            /* FC_BYTE */\r
-                       0x5b,           /* FC_END */\r
-/* 694 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 696 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 698 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 700 */      NdrFcShort( 0xa ),      /* Offset= 10 (710) */\r
-/* 702 */      0x8,            /* FC_LONG */\r
-                       0x8,            /* FC_LONG */\r
-/* 704 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 706 */      NdrFcShort( 0xffd6 ),   /* Offset= -42 (664) */\r
-/* 708 */      0x36,           /* FC_POINTER */\r
-                       0x5b,           /* FC_END */\r
-/* 710 */      \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 712 */      NdrFcShort( 0xffe2 ),   /* Offset= -30 (682) */\r
-/* 714 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x3,            /* 3 */\r
-/* 716 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 718 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 720 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 722 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 724 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 726 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 728 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 730 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 732 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 734 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 736 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 738 */      0x13, 0x0,      /* FC_OP */\r
-/* 740 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (694) */\r
-/* 742 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 744 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 746 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 748 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 750 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 752 */      NdrFcShort( 0x6 ),      /* Offset= 6 (758) */\r
-/* 754 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 756 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 758 */      \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 760 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (714) */\r
-/* 762 */      \r
-                       0x1d,           /* FC_SMFARRAY */\r
-                       0x0,            /* 0 */\r
-/* 764 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 766 */      0x1,            /* FC_BYTE */\r
-                       0x5b,           /* FC_END */\r
-/* 768 */      \r
-                       0x15,           /* FC_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 770 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 772 */      0x8,            /* FC_LONG */\r
-                       0x6,            /* FC_SHORT */\r
-/* 774 */      0x6,            /* FC_SHORT */\r
-                       0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-/* 776 */      0x0,            /* 0 */\r
-                       NdrFcShort( 0xfff1 ),   /* Offset= -15 (762) */\r
-                       0x5b,           /* FC_END */\r
-/* 780 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 782 */      NdrFcShort( 0x18 ),     /* 24 */\r
-/* 784 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 786 */      NdrFcShort( 0xa ),      /* Offset= 10 (796) */\r
-/* 788 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 790 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 792 */      NdrFcShort( 0xffe8 ),   /* Offset= -24 (768) */\r
-/* 794 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 796 */      \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 798 */      NdrFcShort( 0xfefe ),   /* Offset= -258 (540) */\r
-/* 800 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x0,            /* 0 */\r
-/* 802 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 804 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 806 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 808 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 810 */      0x1,            /* FC_BYTE */\r
-                       0x5b,           /* FC_END */\r
-/* 812 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 814 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 816 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 818 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 820 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 822 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 824 */      0x13, 0x0,      /* FC_OP */\r
-/* 826 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (800) */\r
-/* 828 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 830 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 832 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x1,            /* 1 */\r
-/* 834 */      NdrFcShort( 0x2 ),      /* 2 */\r
-/* 836 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 838 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 840 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 842 */      0x6,            /* FC_SHORT */\r
-                       0x5b,           /* FC_END */\r
-/* 844 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 846 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 848 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 850 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 852 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 854 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 856 */      0x13, 0x0,      /* FC_OP */\r
-/* 858 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (832) */\r
-/* 860 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 862 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 864 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x3,            /* 3 */\r
-/* 866 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 868 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 870 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 872 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 874 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 876 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 878 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 880 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 882 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 884 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 886 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 888 */      0x13, 0x0,      /* FC_OP */\r
-/* 890 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (864) */\r
-/* 892 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 894 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 896 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x7,            /* 7 */\r
-/* 898 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 900 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
-                       0x0,            /*  */\r
-/* 902 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 904 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 906 */      0xb,            /* FC_HYPER */\r
-                       0x5b,           /* FC_END */\r
-/* 908 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
-                       0x3,            /* 3 */\r
-/* 910 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 912 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 914 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 916 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 918 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 920 */      0x13, 0x0,      /* FC_OP */\r
-/* 922 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (896) */\r
-/* 924 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 926 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 928 */      \r
-                       0x15,           /* FC_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 930 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 932 */      0x8,            /* FC_LONG */\r
-                       0x8,            /* FC_LONG */\r
-/* 934 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 936 */      \r
-                       0x1b,           /* FC_CARRAY */\r
-                       0x3,            /* 3 */\r
-/* 938 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 940 */      0x7,            /* Corr desc: FC_USHORT */\r
-                       0x0,            /*  */\r
-/* 942 */      NdrFcShort( 0xffd8 ),   /* -40 */\r
-/* 944 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 946 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 948 */      NdrFcShort( 0xffec ),   /* Offset= -20 (928) */\r
-/* 950 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 952 */      \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x3,            /* 3 */\r
-/* 954 */      NdrFcShort( 0x28 ),     /* 40 */\r
-/* 956 */      NdrFcShort( 0xffec ),   /* Offset= -20 (936) */\r
-/* 958 */      NdrFcShort( 0x0 ),      /* Offset= 0 (958) */\r
-/* 960 */      0x6,            /* FC_SHORT */\r
-                       0x6,            /* FC_SHORT */\r
-/* 962 */      0x8,            /* FC_LONG */\r
-                       0x8,            /* FC_LONG */\r
-/* 964 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 966 */      NdrFcShort( 0xfdde ),   /* Offset= -546 (420) */\r
-/* 968 */      0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 970 */      \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 972 */      NdrFcShort( 0xfeea ),   /* Offset= -278 (694) */\r
-/* 974 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 976 */      0x1,            /* FC_BYTE */\r
-                       0x5c,           /* FC_PAD */\r
-/* 978 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 980 */      0x6,            /* FC_SHORT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 982 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 984 */      0x8,            /* FC_LONG */\r
-                       0x5c,           /* FC_PAD */\r
-/* 986 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 988 */      0xb,            /* FC_HYPER */\r
-                       0x5c,           /* FC_PAD */\r
-/* 990 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 992 */      0xa,            /* FC_FLOAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 994 */      \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 996 */      0xc,            /* FC_DOUBLE */\r
-                       0x5c,           /* FC_PAD */\r
-/* 998 */      \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 1000 */     NdrFcShort( 0xfd9c ),   /* Offset= -612 (388) */\r
-/* 1002 */     \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 1004 */     NdrFcShort( 0xfc1a ),   /* Offset= -998 (6) */\r
-/* 1006 */     \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 1008 */     NdrFcShort( 0xfd9a ),   /* Offset= -614 (394) */\r
-/* 1010 */     \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 1012 */     NdrFcShort( 0xfc4c ),   /* Offset= -948 (64) */\r
-/* 1014 */     \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 1016 */     NdrFcShort( 0xfda4 ),   /* Offset= -604 (412) */\r
-/* 1018 */     \r
-                       0x13, 0x10,     /* FC_OP [pointer_deref] */\r
-/* 1020 */     NdrFcShort( 0x2 ),      /* Offset= 2 (1022) */\r
-/* 1022 */     \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 1024 */     NdrFcShort( 0x14 ),     /* Offset= 20 (1044) */\r
-/* 1026 */     \r
-                       0x15,           /* FC_STRUCT */\r
-                       0x7,            /* 7 */\r
-/* 1028 */     NdrFcShort( 0x10 ),     /* 16 */\r
-/* 1030 */     0x6,            /* FC_SHORT */\r
-                       0x1,            /* FC_BYTE */\r
-/* 1032 */     0x1,            /* FC_BYTE */\r
-                       0x8,            /* FC_LONG */\r
-/* 1034 */     0xb,            /* FC_HYPER */\r
-                       0x5b,           /* FC_END */\r
-/* 1036 */     \r
-                       0x13, 0x0,      /* FC_OP */\r
-/* 1038 */     NdrFcShort( 0xfff4 ),   /* Offset= -12 (1026) */\r
-/* 1040 */     \r
-                       0x13, 0x8,      /* FC_OP [simple_pointer] */\r
-/* 1042 */     0x2,            /* FC_CHAR */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1044 */     \r
-                       0x1a,           /* FC_BOGUS_STRUCT */\r
-                       0x7,            /* 7 */\r
-/* 1046 */     NdrFcShort( 0x20 ),     /* 32 */\r
-/* 1048 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1050 */     NdrFcShort( 0x0 ),      /* Offset= 0 (1050) */\r
-/* 1052 */     0x8,            /* FC_LONG */\r
-                       0x8,            /* FC_LONG */\r
-/* 1054 */     0x6,            /* FC_SHORT */\r
-                       0x6,            /* FC_SHORT */\r
-/* 1056 */     0x6,            /* FC_SHORT */\r
-                       0x6,            /* FC_SHORT */\r
-/* 1058 */     0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 1060 */     NdrFcShort( 0xfc36 ),   /* Offset= -970 (90) */\r
-/* 1062 */     0x5c,           /* FC_PAD */\r
-                       0x5b,           /* FC_END */\r
-/* 1064 */     0xb4,           /* FC_USER_MARSHAL */\r
-                       0x83,           /* 131 */\r
-/* 1066 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1068 */     NdrFcShort( 0x10 ),     /* 16 */\r
-/* 1070 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1072 */     NdrFcShort( 0xfc26 ),   /* Offset= -986 (86) */\r
-/* 1074 */     \r
-                       0x11, 0x0,      /* FC_RP */\r
-/* 1076 */     NdrFcShort( 0x6 ),      /* Offset= 6 (1082) */\r
-/* 1078 */     \r
-                       0x12, 0x0,      /* FC_UP */\r
-/* 1080 */     NdrFcShort( 0xffdc ),   /* Offset= -36 (1044) */\r
-/* 1082 */     0xb4,           /* FC_USER_MARSHAL */\r
-                       0x83,           /* 131 */\r
-/* 1084 */     NdrFcShort( 0x1 ),      /* 1 */\r
-/* 1086 */     NdrFcShort( 0x10 ),     /* 16 */\r
-/* 1088 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1090 */     NdrFcShort( 0xfff4 ),   /* Offset= -12 (1078) */\r
-/* 1092 */     \r
-                       0x11, 0x10,     /* FC_RP [pointer_deref] */\r
-/* 1094 */     NdrFcShort( 0x2 ),      /* Offset= 2 (1096) */\r
-/* 1096 */     \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 1098 */     NdrFcLong( 0xee38d0f1 ),        /* -298266383 */\r
-/* 1102 */     NdrFcShort( 0x5ae3 ),   /* 23267 */\r
-/* 1104 */     NdrFcShort( 0x408c ),   /* 16524 */\r
-/* 1106 */     0xa6,           /* 166 */\r
-                       0xbf,           /* 191 */\r
-/* 1108 */     0x84,           /* 132 */\r
-                       0x10,           /* 16 */\r
-/* 1110 */     0xe6,           /* 230 */\r
-                       0x45,           /* 69 */\r
-/* 1112 */     0xf3,           /* 243 */\r
-                       0x76,           /* 118 */\r
-/* 1114 */     \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 1116 */     NdrFcLong( 0xc ),       /* 12 */\r
-/* 1120 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1122 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1124 */     0xc0,           /* 192 */\r
-                       0x0,            /* 0 */\r
-/* 1126 */     0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 1128 */     0x0,            /* 0 */\r
-                       0x0,            /* 0 */\r
-/* 1130 */     0x0,            /* 0 */\r
-                       0x46,           /* 70 */\r
-/* 1132 */     \r
-                       0x11, 0xc,      /* FC_RP [alloced_on_stack] [simple_pointer] */\r
-/* 1134 */     0x8,            /* FC_LONG */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1136 */     \r
-                       0x2f,           /* FC_IP */\r
-                       0x5a,           /* FC_CONSTANT_IID */\r
-/* 1138 */     NdrFcLong( 0x2e340632 ),        /* 775161394 */\r
-/* 1142 */     NdrFcShort( 0x5d5a ),   /* 23898 */\r
-/* 1144 */     NdrFcShort( 0x427b ),   /* 17019 */\r
-/* 1146 */     0xac,           /* 172 */\r
-                       0x31,           /* 49 */\r
-/* 1148 */     0x30,           /* 48 */\r
-                       0x3f,           /* 63 */\r
-/* 1150 */     0x6e,           /* 110 */\r
-                       0x32,           /* 50 */\r
-/* 1152 */     0xb9,           /* 185 */\r
-                       0xe8,           /* 232 */\r
-/* 1154 */     \r
-                       0x11, 0x10,     /* FC_RP [pointer_deref] */\r
-/* 1156 */     NdrFcShort( 0xffd6 ),   /* Offset= -42 (1114) */\r
-/* 1158 */     \r
-                       0x11, 0x10,     /* FC_RP [pointer_deref] */\r
-/* 1160 */     NdrFcShort( 0xfd02 ),   /* Offset= -766 (394) */\r
-\r
-                       0x0\r
-        }\r
-    };\r
-\r
-static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ] = \r
-        {\r
-            \r
-            {\r
-            BSTR_UserSize\r
-            ,BSTR_UserMarshal\r
-            ,BSTR_UserUnmarshal\r
-            ,BSTR_UserFree\r
-            },\r
-            {\r
-            VARIANT_UserSize\r
-            ,VARIANT_UserMarshal\r
-            ,VARIANT_UserUnmarshal\r
-            ,VARIANT_UserFree\r
-            }\r
-\r
-        };\r
-\r
-\r
-\r
-/* Object interface: IUnknown, ver. 0.0,\r
-   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */\r
-\r
-\r
-/* Object interface: IDispatch, ver. 0.0,\r
-   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */\r
-\r
-\r
-/* Object interface: IXcpObject, ver. 0.0,\r
-   GUID={0xEE38D0F1,0x5AE3,0x408c,{0xA6,0xBF,0x84,0x10,0xE6,0x45,0xF3,0x76}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpObject_FormatStringOffsetTable[] =\r
-    {\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    0\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpObject_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpObject_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpObject_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpObject_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(7) _IXcpObjectProxyVtbl = \r
-{\r
-    0,\r
-    &IID_IXcpObject,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    0 /* IDispatch::GetTypeInfoCount */ ,\r
-    0 /* IDispatch::GetTypeInfo */ ,\r
-    0 /* IDispatch::GetIDsOfNames */ ,\r
-    0 /* IDispatch_Invoke_Proxy */\r
-};\r
-\r
-\r
-static const PRPC_STUB_FUNCTION IXcpObject_table[] =\r
-{\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION\r
-};\r
-\r
-CInterfaceStubVtbl _IXcpObjectStubVtbl =\r
-{\r
-    &IID_IXcpObject,\r
-    &IXcpObject_ServerInfo,\r
-    7,\r
-    &IXcpObject_table[-3],\r
-    CStdStubBuffer_DELEGATING_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControl, ver. 0.0,\r
-   GUID={0x1FB839CC,0x116C,0x4C9B,{0xAE,0x8E,0x3D,0xBB,0x64,0x96,0xE3,0x26}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControl_FormatStringOffsetTable[] =\r
-    {\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    0,\r
-    36,\r
-    72,\r
-    108,\r
-    144,\r
-    180,\r
-    216,\r
-    252,\r
-    288,\r
-    324,\r
-    366,\r
-    408,\r
-    444\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControl_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControl_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControl_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControl_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(20) _IXcpControlProxyVtbl = \r
-{\r
-    &IXcpControl_ProxyInfo,\r
-    &IID_IXcpControl,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    0 /* IDispatch::GetTypeInfoCount */ ,\r
-    0 /* IDispatch::GetTypeInfo */ ,\r
-    0 /* IDispatch::GetIDsOfNames */ ,\r
-    0 /* IDispatch_Invoke_Proxy */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Source */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_Source */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_IsLoaded */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Content */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Settings */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_OnLoad */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_OnLoad */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_OnError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_OnError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::CreateObject */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::IsVersionSupported */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_InitParams */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_InitParams */\r
-};\r
-\r
-\r
-static const PRPC_STUB_FUNCTION IXcpControl_table[] =\r
-{\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2\r
-};\r
-\r
-CInterfaceStubVtbl _IXcpControlStubVtbl =\r
-{\r
-    &IID_IXcpControl,\r
-    &IXcpControl_ServerInfo,\r
-    20,\r
-    &IXcpControl_table[-3],\r
-    CStdStubBuffer_DELEGATING_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControl2, ver. 0.0,\r
-   GUID={0x1c3294f9,0x891f,0x49b1,{0xbb,0xae,0x49,0x2a,0x68,0xba,0x10,0xcc}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControl2_FormatStringOffsetTable[] =\r
-    {\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    (unsigned short) -1,\r
-    0,\r
-    36,\r
-    72,\r
-    108,\r
-    144,\r
-    180,\r
-    216,\r
-    252,\r
-    288,\r
-    324,\r
-    366,\r
-    408,\r
-    444,\r
-    480,\r
-    510,\r
-    546,\r
-    582,\r
-    618,\r
-    654,\r
-    690\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControl2_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControl2_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControl2_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControl2_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(27) _IXcpControl2ProxyVtbl = \r
-{\r
-    &IXcpControl2_ProxyInfo,\r
-    &IID_IXcpControl2,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    0 /* IDispatch::GetTypeInfoCount */ ,\r
-    0 /* IDispatch::GetTypeInfo */ ,\r
-    0 /* IDispatch::GetIDsOfNames */ ,\r
-    0 /* IDispatch_Invoke_Proxy */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Source */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_Source */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_IsLoaded */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Content */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_Settings */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_OnLoad */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_OnLoad */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_OnError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_OnError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::CreateObject */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::IsVersionSupported */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::get_InitParams */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl::put_InitParams */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::LoadRuntime */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::get_SplashScreenSource */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::put_SplashScreenSource */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::get_OnSourceDownloadComplete */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::put_OnSourceDownloadComplete */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::get_OnSourceDownloadProgressChanged */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControl2::put_OnSourceDownloadProgressChanged */\r
-};\r
-\r
-\r
-static const PRPC_STUB_FUNCTION IXcpControl2_table[] =\r
-{\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    STUB_FORWARDING_FUNCTION,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2,\r
-    NdrStubCall2\r
-};\r
-\r
-CInterfaceStubVtbl _IXcpControl2StubVtbl =\r
-{\r
-    &IID_IXcpControl2,\r
-    &IXcpControl2_ServerInfo,\r
-    27,\r
-    &IXcpControl2_table[-3],\r
-    CStdStubBuffer_DELEGATING_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControlDownloadCallback, ver. 0.0,\r
-   GUID={0x2E340632,0x5D5A,0x427b,{0xAC,0x31,0x30,0x3F,0x6E,0x32,0xB9,0xE8}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControlDownloadCallback_FormatStringOffsetTable[] =\r
-    {\r
-    726\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControlDownloadCallback_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlDownloadCallback_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControlDownloadCallback_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlDownloadCallback_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(4) _IXcpControlDownloadCallbackProxyVtbl = \r
-{\r
-    &IXcpControlDownloadCallback_ProxyInfo,\r
-    &IID_IXcpControlDownloadCallback,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlDownloadCallback::OnUrlDownloaded */\r
-};\r
-\r
-const CInterfaceStubVtbl _IXcpControlDownloadCallbackStubVtbl =\r
-{\r
-    &IID_IXcpControlDownloadCallback,\r
-    &IXcpControlDownloadCallback_ServerInfo,\r
-    4,\r
-    0, /* pure interpreted */\r
-    CStdStubBuffer_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControlHost, ver. 0.0,\r
-   GUID={0x1B36028E,0xB491,0x4bb2,{0x85,0x84,0x8A,0x9E,0x0A,0x67,0x7D,0x6E}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControlHost_FormatStringOffsetTable[] =\r
-    {\r
-    768,\r
-    804,\r
-    834,\r
-    888,\r
-    0,\r
-    942,\r
-    984\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControlHost_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControlHost_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(10) _IXcpControlHostProxyVtbl = \r
-{\r
-    &IXcpControlHost_ProxyInfo,\r
-    &IID_IXcpControlHost,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetHostOptions */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyLoaded */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::InvokeHandler */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetBaseUrl */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetNamedSource */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::DownloadUrl */\r
-};\r
-\r
-const CInterfaceStubVtbl _IXcpControlHostStubVtbl =\r
-{\r
-    &IID_IXcpControlHost,\r
-    &IXcpControlHost_ServerInfo,\r
-    10,\r
-    0, /* pure interpreted */\r
-    CStdStubBuffer_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControlHost2, ver. 0.0,\r
-   GUID={0xfb3ed7c4,0x5797,0x4b44,{0x86,0x95,0x0c,0x51,0x2e,0xa2,0x7d,0x8f}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControlHost2_FormatStringOffsetTable[] =\r
-    {\r
-    768,\r
-    804,\r
-    834,\r
-    888,\r
-    0,\r
-    942,\r
-    984,\r
-    1032,\r
-    1068\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControlHost2_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost2_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControlHost2_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost2_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(12) _IXcpControlHost2ProxyVtbl = \r
-{\r
-    &IXcpControlHost2_ProxyInfo,\r
-    &IID_IXcpControlHost2,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetHostOptions */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyLoaded */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::InvokeHandler */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetBaseUrl */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetNamedSource */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::DownloadUrl */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost2::GetCustomAppDomain */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost2::GetControlVersion */\r
-};\r
-\r
-const CInterfaceStubVtbl _IXcpControlHost2StubVtbl =\r
-{\r
-    &IID_IXcpControlHost2,\r
-    &IXcpControlHost2_ServerInfo,\r
-    12,\r
-    0, /* pure interpreted */\r
-    CStdStubBuffer_METHODS\r
-};\r
-\r
-\r
-/* Object interface: IXcpControlHost3, ver. 0.0,\r
-   GUID={0x9fb2ce5f,0x06ff,0x4058,{0xbe,0xfa,0xdd,0xfa,0xb5,0x96,0xb3,0xd5}} */\r
-\r
-#pragma code_seg(".orpc")\r
-static const unsigned short IXcpControlHost3_FormatStringOffsetTable[] =\r
-    {\r
-    768,\r
-    804,\r
-    834,\r
-    888,\r
-    0,\r
-    942,\r
-    984,\r
-    1032,\r
-    1068,\r
-    1110,\r
-    1152,\r
-    1188\r
-    };\r
-\r
-static const MIDL_STUBLESS_PROXY_INFO IXcpControlHost3_ProxyInfo =\r
-    {\r
-    &Object_StubDesc,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost3_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0\r
-    };\r
-\r
-\r
-static const MIDL_SERVER_INFO IXcpControlHost3_ServerInfo = \r
-    {\r
-    &Object_StubDesc,\r
-    0,\r
-    xcpctrl__MIDL_ProcFormatString.Format,\r
-    &IXcpControlHost3_FormatStringOffsetTable[-3],\r
-    0,\r
-    0,\r
-    0,\r
-    0};\r
-CINTERFACE_PROXY_VTABLE(15) _IXcpControlHost3ProxyVtbl = \r
-{\r
-    &IXcpControlHost3_ProxyInfo,\r
-    &IID_IXcpControlHost3,\r
-    IUnknown_QueryInterface_Proxy,\r
-    IUnknown_AddRef_Proxy,\r
-    IUnknown_Release_Proxy ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetHostOptions */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyLoaded */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::NotifyError */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::InvokeHandler */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetBaseUrl */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::GetNamedSource */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost::DownloadUrl */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost2::GetCustomAppDomain */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost2::GetControlVersion */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost3::GetDefaultThemeXaml */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost3::GetDefaultPortableUserInterfaceFontInfo */ ,\r
-    (void *) (INT_PTR) -1 /* IXcpControlHost3::GetComAutomationObject */\r
-};\r
-\r
-const CInterfaceStubVtbl _IXcpControlHost3StubVtbl =\r
-{\r
-    &IID_IXcpControlHost3,\r
-    &IXcpControlHost3_ServerInfo,\r
-    15,\r
-    0, /* pure interpreted */\r
-    CStdStubBuffer_METHODS\r
-};\r
-\r
-static const MIDL_STUB_DESC Object_StubDesc = \r
-    {\r
-    0,\r
-    NdrOleAllocate,\r
-    NdrOleFree,\r
-    0,\r
-    0,\r
-    0,\r
-    0,\r
-    0,\r
-    xcpctrl__MIDL_TypeFormatString.Format,\r
-    1, /* -error bounds_check flag */\r
-    0x50002, /* Ndr library version */\r
-    0,\r
-    0x700022b, /* MIDL Version 7.0.555 */\r
-    0,\r
-    UserMarshalRoutines,\r
-    0,  /* notify & notify_flag routine table */\r
-    0x1, /* MIDL flag */\r
-    0, /* cs routines */\r
-    0,   /* proxy/server info */\r
-    0\r
-    };\r
-\r
-const CInterfaceProxyVtbl * const _xcpctrl_ProxyVtblList[] = \r
-{\r
-    ( CInterfaceProxyVtbl *) &_IXcpControlDownloadCallbackProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpControlHost3ProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpControlHostProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpControlHost2ProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpControlProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpObjectProxyVtbl,\r
-    ( CInterfaceProxyVtbl *) &_IXcpControl2ProxyVtbl,\r
-    0\r
-};\r
-\r
-const CInterfaceStubVtbl * const _xcpctrl_StubVtblList[] = \r
-{\r
-    ( CInterfaceStubVtbl *) &_IXcpControlDownloadCallbackStubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpControlHost3StubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpControlHostStubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpControlHost2StubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpControlStubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpObjectStubVtbl,\r
-    ( CInterfaceStubVtbl *) &_IXcpControl2StubVtbl,\r
-    0\r
-};\r
-\r
-PCInterfaceName const _xcpctrl_InterfaceNamesList[] = \r
-{\r
-    "IXcpControlDownloadCallback",\r
-    "IXcpControlHost3",\r
-    "IXcpControlHost",\r
-    "IXcpControlHost2",\r
-    "IXcpControl",\r
-    "IXcpObject",\r
-    "IXcpControl2",\r
-    0\r
-};\r
-\r
-const IID *  const _xcpctrl_BaseIIDList[] = \r
-{\r
-    0,\r
-    0,\r
-    0,\r
-    0,\r
-    &IID_IDispatch,\r
-    &IID_IDispatch,\r
-    &IID_IDispatch,\r
-    0\r
-};\r
-\r
-\r
-#define _xcpctrl_CHECK_IID(n)  IID_GENERIC_CHECK_IID( _xcpctrl, pIID, n)\r
-\r
-int __stdcall _xcpctrl_IID_Lookup( const IID * pIID, int * pIndex )\r
-{\r
-    IID_BS_LOOKUP_SETUP\r
-\r
-    IID_BS_LOOKUP_INITIAL_TEST( _xcpctrl, 7, 4 )\r
-    IID_BS_LOOKUP_NEXT_TEST( _xcpctrl, 2 )\r
-    IID_BS_LOOKUP_NEXT_TEST( _xcpctrl, 1 )\r
-    IID_BS_LOOKUP_RETURN_RESULT( _xcpctrl, 7, *pIndex )\r
-    \r
-}\r
-\r
-const ExtendedProxyFileInfo xcpctrl_ProxyFileInfo = \r
-{\r
-    (PCInterfaceProxyVtblList *) & _xcpctrl_ProxyVtblList,\r
-    (PCInterfaceStubVtblList *) & _xcpctrl_StubVtblList,\r
-    (const PCInterfaceName * ) & _xcpctrl_InterfaceNamesList,\r
-    (const IID ** ) & _xcpctrl_BaseIIDList,\r
-    & _xcpctrl_IID_Lookup, \r
-    7,\r
-    2,\r
-    0, /* table of [async_uuid] interfaces */\r
-    0, /* Filler1 */\r
-    0, /* Filler2 */\r
-    0  /* Filler3 */\r
-};\r
-#pragma optimize("", on )\r
-#if _MSC_VER >= 1200\r
-#pragma warning(pop)\r
-#endif\r
-\r
-\r
-#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/\r
-\r

diff --git a/modules/silverlight/producer/silverlight_producer.cpp b/modules/silverlight/producer/silverlight_producer.cpp
deleted file mode 100644 (file)
index 9e86718..0000000
--- a/modules/silverlight/producer/silverlight_producer.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
- \r
-#include "../stdafx.h"\r
-\r
-#if defined(_MSC_VER)\r
-#pragma warning (disable : 4714) // marked as __forceinline not inlined\r
-#pragma warning (disable : 4146)\r
-#endif\r
-\r
-#include "silverlight_producer.h"\r
-\r
-#include "../interop/XcpControlHost.h"\r
-\r
-#include <core/video_format.h>\r
-\r
-#include <core/mixer/write_frame.h>\r
-#include <core/producer/frame/frame_factory.h>\r
-\r
-#include <common/concurrency/executor.h>\r
-#include <common/env.h>\r
-\r
-#include <boost/filesystem.hpp>\r
-\r
-#include <SFML/Graphics.hpp>\r
-\r
-namespace caspar {\r
-               \r
-class silverlight_renderer\r
-{\r
-       struct co_init\r
-       {\r
-               co_init(){CoInitialize(nullptr);}\r
-               ~co_init(){CoUninitialize();}\r
-       } co;\r
-       \r
-       int id_;\r
-\r
-       const std::shared_ptr<core::frame_factory> frame_factory_;\r
-       const core::video_format_desc format_desc_;\r
-       \r
-       CComObject<XcpControlHost>* host_;\r
-       tbb::spin_mutex mutex_;\r
-       safe_ptr<core::basic_frame> last_frame_;\r
-\r
-       sf::RenderWindow window_;\r
-                       \r
-       HDC screen_;\r
-       HDC mem_;\r
-       HBITMAP bmp_;\r
-       unsigned char* bmp_data_;\r
-\r
-public:\r
-       silverlight_renderer(const std::shared_ptr<core::frame_factory>& frame_factory) \r
-               : frame_factory_(frame_factory)\r
-               , format_desc_(frame_factory->get_video_format_desc())\r
-               , last_frame_(core::basic_frame::empty())\r
-               , host_(nullptr)\r
-               , id_(rand())\r
-               , window_(sf::VideoMode(format_desc_.width, format_desc_.height, 32), boost::lexical_cast<std::string>(id_), sf::Style::None)\r
-       {\r
-               if(FAILED(CComObject<XcpControlHost>::CreateInstance(&host_)))\r
-                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to create XcpControlHost"));\r
-               \r
-               HWND hWnd = ::FindWindow(L"SFML_Window", boost::lexical_cast<std::wstring>(id_).c_str());\r
-               if(FAILED(host_->CreateXcpControl(hWnd)))\r
-                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to Create XcpControl"));\r
-               \r
-               screen_= ::GetDC(hWnd);\r
-               mem_ = ::CreateCompatibleDC(screen_);\r
-                               \r
-               BITMAPINFO info;\r
-               memset(&info, 0, sizeof(BITMAPINFO));\r
-               info.bmiHeader.biBitCount = 32;\r
-               info.bmiHeader.biCompression = BI_RGB;\r
-               info.bmiHeader.biHeight = -static_cast<int>(format_desc_.height);\r
-               info.bmiHeader.biPlanes = 1;\r
-               info.bmiHeader.biSize = sizeof(BITMAPINFO);\r
-               info.bmiHeader.biWidth = format_desc_.width;\r
-\r
-               bmp_ = ::CreateDIBSection(screen_, &info, DIB_RGB_COLORS, reinterpret_cast<void**>(&bmp_data_), 0, 0);\r
-               SelectObject(mem_, bmp_);\r
-       }\r
-\r
-       ~silverlight_renderer()\r
-       {               \r
-               DeleteObject(bmp_);\r
-               DeleteDC(mem_);\r
-               DeleteDC(screen_);\r
-\r
-               if(host_)\r
-               {\r
-                       host_->DestroyXcpControl();\r
-                       host_->Release();\r
-               }\r
-       }\r
-                       \r
-       void render()\r
-       {       \r
-               sf::Event Event;\r
-               while (window_.GetEvent(Event)){}\r
-               window_.Display();\r
-                               \r
-               auto frame = frame_factory_->create_frame(this, format_desc_.width, format_desc_.height);\r
-               ::BitBlt(mem_, 0, 0, format_desc_.width, format_desc_.height, screen_, 0, 0, SRCCOPY);          \r
-               std::copy_n(bmp_data_, format_desc_.size, frame->image_data().begin());\r
-\r
-               tbb::spin_mutex::scoped_lock lock(mutex_);\r
-               last_frame_ = frame;\r
-       }\r
-               \r
-       safe_ptr<core::basic_frame> get_frame()\r
-       {               \r
-               tbb::spin_mutex::scoped_lock lock(mutex_);\r
-               return last_frame_;\r
-       }\r
-};\r
-\r
-struct silverlight_producer : public core::frame_producer\r
-{                              \r
-       std::unique_ptr<silverlight_renderer> renderer_;\r
-       \r
-       executor executor_;\r
-public:\r
-\r
-       silverlight_producer(const safe_ptr<core::frame_factory>& frame_factory) : executor_(L"silverlight")\r
-       {\r
-               executor_.invoke([=]\r
-               {\r
-                       renderer_.reset(new silverlight_renderer(frame_factory));\r
-               });\r
-       }\r
-               \r
-       virtual safe_ptr<core::basic_frame> receive()\r
-       {\r
-               executor_.begin_invoke([=]\r
-               {\r
-                       renderer_->render();\r
-               });\r
-\r
-               return renderer_->get_frame();\r
-       }\r
-\r
-       std::wstring print() const{ return L"silverlight"; }    \r
-};\r
-\r
-safe_ptr<core::frame_producer> create_silverlight_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
-{\r
-       //std::wstring filename = env::template_folder() + L"\\" + params[0] + L".xap";\r
-       //if(!boost::filesystem::exists(filename))\r
-       //      return frame_producer::empty();\r
-       if(params[0] != L"SILVER")\r
-               return core::frame_producer::empty();\r
-\r
-       return make_safe<silverlight_producer>(frame_factory);\r
-}\r
-\r
-}
\ No newline at end of file

diff --git a/modules/silverlight/producer/silverlight_producer.h b/modules/silverlight/producer/silverlight_producer.h
deleted file mode 100644 (file)
index 7f29d57..0000000
--- a/modules/silverlight/producer/silverlight_producer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include <core/producer/frame_producer.h>\r
-\r
-#include <string>\r
-#include <vector>\r
-\r
-namespace caspar {\r
-       \r
-safe_ptr<core::frame_producer> create_silverlight_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-\r
-}\r

diff --git a/modules/silverlight/silverlight.cpp b/modules/silverlight/silverlight.cpp
deleted file mode 100644 (file)
index a9b9b44..0000000
--- a/modules/silverlight/silverlight.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#include "stdafx.h"\r
-\r
-#include "silverlight.h"\r
-\r
-#include "producer/silverlight_producer.h"\r
-\r
-#include <core/producer/frame_producer.h>\r
-\r
-namespace caspar{\r
-\r
-void init_silverlight()\r
-{\r
-       core::register_producer_factory(create_silverlight_producer);\r
-}\r
-\r
-}
\ No newline at end of file

diff --git a/modules/silverlight/silverlight.h b/modules/silverlight/silverlight.h
deleted file mode 100644 (file)
index b2b0b2b..0000000
--- a/modules/silverlight/silverlight.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-namespace caspar {\r
-\r
-void init_silverlight();\r
-\r
-}
\ No newline at end of file

diff --git a/modules/silverlight/silverlight.vcxproj b/modules/silverlight/silverlight.vcxproj
deleted file mode 100644 (file)
index ad9c112..0000000
--- a/modules/silverlight/silverlight.vcxproj
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Profile|Win32">\r
-      <Configuration>Profile</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Develop|Win32">\r
-      <Configuration>Develop</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{B964D953-8882-454C-A935-DB711D697E39}</ProjectGuid>\r
-    <RootNamespace>silverlight</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <ProjectName>silverlight</ProjectName>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>false</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>false</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>false</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <UseIntelTBB>true</UseIntelTBB>\r
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;..\..\dependencies\SFML-1.6\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectName)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectName)</TargetName>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <MinimalRebuild>false</MinimalRebuild>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <SmallerTypeCheck>false</SmallerTypeCheck>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <PreprocessorDefinitions>TBB_USE_DEBUG;TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <FloatingPointModel>Fast</FloatingPointModel>\r
-      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
-    </ClCompile>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-    <Lib />\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
-      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WholeProgramOptimization>true</WholeProgramOptimization>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <OmitFramePointers>true</OmitFramePointers>\r
-      <FloatingPointModel>Fast</FloatingPointModel>\r
-      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
-    </ClCompile>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-    <Lib>\r
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>\r
-    </Lib>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
-      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WholeProgramOptimization>false</WholeProgramOptimization>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <OmitFramePointers>true</OmitFramePointers>\r
-      <FloatingPointModel>Fast</FloatingPointModel>\r
-      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
-    </ClCompile>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-    <Lib />\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
-      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <ExceptionHandling>Async</ExceptionHandling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WholeProgramOptimization>false</WholeProgramOptimization>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <OmitFramePointers>true</OmitFramePointers>\r
-      <FloatingPointModel>Fast</FloatingPointModel>\r
-      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
-    </ClCompile>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-    <Lib />\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\common\common.vcxproj">\r
-      <Project>{02308602-7fe0-4253-b96e-22134919f56a}</Project>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\core\core.vcxproj">\r
-      <Project>{79388c20-6499-4bf6-b8b9-d8c33d7d4ddd}</Project>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="interop\XcpControlHost.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\xcpctrl_i.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\xcpctrl_p.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\XcpPropertyBag.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="producer\silverlight_producer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="silverlight.cpp">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="StdAfx.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">Create</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="interop\XcpControlHost.h" />\r
-    <ClInclude Include="interop\xcpctrl.h" />\r
-    <ClInclude Include="interop\xcpctrl_h.h" />\r
-    <ClInclude Include="interop\XcpPropertyBag.h" />\r
-    <ClInclude Include="producer\silverlight_producer.h" />\r
-    <ClInclude Include="silverlight.h" />\r
-    <ClInclude Include="StdAfx.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Midl Include="interop\xcpctrl.idl">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-    </Midl>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file

diff --git a/modules/silverlight/silverlight.vcxproj.filters b/modules/silverlight/silverlight.vcxproj.filters
deleted file mode 100644 (file)
index bd1460a..0000000
--- a/modules/silverlight/silverlight.vcxproj.filters
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="interop">\r
-      <UniqueIdentifier>{4f739737-1661-40dd-afc7-5cc64598f500}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="producer">\r
-      <UniqueIdentifier>{d33ae2d6-7928-46bb-940b-c7c76c601329}</UniqueIdentifier>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="producer\silverlight_producer.cpp">\r
-      <Filter>producer</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\xcpctrl_i.c">\r
-      <Filter>interop</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\xcpctrl_p.c">\r
-      <Filter>interop</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\XcpPropertyBag.cpp">\r
-      <Filter>interop</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="interop\XcpControlHost.cpp">\r
-      <Filter>interop</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="silverlight.cpp" />\r
-    <ClCompile Include="StdAfx.cpp" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="producer\silverlight_producer.h">\r
-      <Filter>producer</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="interop\xcpctrl.h">\r
-      <Filter>interop</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="interop\xcpctrl_h.h">\r
-      <Filter>interop</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="interop\XcpPropertyBag.h">\r
-      <Filter>interop</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="interop\XcpControlHost.h">\r
-      <Filter>interop</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="silverlight.h" />\r
-    <ClInclude Include="StdAfx.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Midl Include="interop\xcpctrl.idl">\r
-      <Filter>interop</Filter>\r
-    </Midl>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file

diff --git a/shell/server.cpp b/shell/server.cpp
index 0310a3a5f3017e22c7afbadc4bee13491fb37b1d..8e38b088d605deacf544723e828a4ae669a1fbfa 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -48,7 +48,6 @@
 #include <modules/oal/oal.h>\r
 #include <modules/ogl/ogl.h>\r
 #include <modules/newtek/newtek.h>\r
-#include <modules/silverlight/silverlight.h>\r
 #include <modules/image/image.h>\r
 #include <modules/image/consumer/image_consumer.h>\r
 \r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 278b9eae822368c3865778325107e7d65aae4bda..c69023751b383ea635eeec5740774790c94e262f 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -128,14 +128,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)tmp\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(SolutionDir)tmp\$(Configuration)\</IntDir>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>\r
@@ -202,7 +202,7 @@
       <MapExports>false</MapExports>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
@@ -264,7 +264,7 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       <LargeAddressAware>true</LargeAddressAware>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
@@ -325,7 +325,7 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
@@ -386,7 +386,7 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r

diff --git a/version.tmpl b/version.tmpl
index f4afcc6ae953e14007bfecb35a567c9ef47994d9..543c98854c396d0d4c41411e12ba3fadb1c91efd 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,4 +1,4 @@
 #define CASPAR_GEN 2\r
 #define CASPAR_MAYOR 0\r
-#define CASPAR_MINOR 6\r
-#define CASPAR_TAG "Stable"\r
+#define CASPAR_MINOR 7\r
+#define CASPAR_TAG "Beta"\r